Merge branch 'master-v3.0' into saclay-v3.0

Conflicts:
	saclay_static/saclay/css/styles.css
	saclay_static/saclay/js/interface.js
	settings.py
	templates/chimere/base.html
	templates/chimere/blocks/map.html
	templates/chimere/blocks/share_bar.html
	templates/chimere/blocks/welcome.html

295 files changed, 353 insertions, 716 deletions

diff --git a/.gitignore b/.gitignore
index 4ca63a7..af32872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,11 +5,5 @@
 *.ignore
 media/*
 local_settings.py
-static/admin/
-static/chimere/
-static/chosen/
-static/icons/
-static/jme/
-static/upload/
-static/prettyPhoto/
 site_static/lib/db.php
+chimere/*
diff --git a/forms.py b/forms.py
index 3e42d66..74e8690 100644
--- a/forms.py
+++ b/forms.py
@@ -25,9 +25,10 @@ from django.utils.translation import ugettext as _
 
 from chimere.models import SubCategory
 from chimere.forms import MarkerForm as BaseMarkerForm, \
-                          RouteForm as BaseRouteForm
+    RouteForm as BaseRouteForm
 from chimere.widgets import TextareaWidget
 
+
 class MarkerForm(BaseMarkerForm):
     categories = forms.ChoiceField(choices=[], widget=forms.Select)
     description = forms.CharField(widget=TextareaWidget, required=False)
@@ -35,7 +36,7 @@ class MarkerForm(BaseMarkerForm):
     def __init__(self, *args, **kwargs):
         super(MarkerForm, self).__init__(*args, **kwargs)
         self.fields['categories'].widget.choices = [('', _(u"Select"))] + \
-                           SubCategory.getAvailableTuples(item_types=['M', 'B'])
+            SubCategory.getAvailableTuples(item_types=['M', 'B'])
 
     def clean_categories(self):
         cats = self.cleaned_data.get('categories')
@@ -44,6 +45,7 @@ class MarkerForm(BaseMarkerForm):
                 self.cleaned_data['categories'] = [cats]
         return self.cleaned_data['categories']
 
+
 class RouteForm(BaseRouteForm):
     categories = forms.ChoiceField(choices=[], widget=forms.Select)
     description = forms.CharField(widget=TextareaWidget, required=False)
@@ -51,7 +53,7 @@ class RouteForm(BaseRouteForm):
     def __init__(self, *args, **kwargs):
         super(RouteForm, self).__init__(*args, **kwargs)
         self.fields['categories'].widget.choices = [('', _(u"Select"))] + \
-                           SubCategory.getAvailableTuples(item_types=['R', 'B'])
+            SubCategory.getAvailableTuples(item_types=['R', 'B'])
 
     def clean_categories(self):
         cats = self.cleaned_data.get('categories')
diff --git a/manage.py b/manage.py
index abb366f..504c115 100755
--- a/manage.py
+++ b/manage.py
@@ -1,15 +1,13 @@
-#!/usr/bin/env python
-import os, sys
-from django.core.management import execute_manager
-sys.path.insert(0, '/home/nim/Work/chimere-project/chimere/')
-sys.path.insert(0, os.path.abspath('./..'))
-
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+#!/usr/bin/env python3
+
+import os
+import sys
+
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    sys.path.insert(0, os.path.abspath('./../'))
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/static/jquery-ui/base/images/animated-overlay.gif b/saclay_static/jquery-ui/base/images/animated-overlay.gif
index d441f75..d441f75 100644
--- a/static/jquery-ui/base/images/animated-overlay.gif
+++ b/saclay_static/jquery-ui/base/images/animated-overlay.gif
diff --git a/static/jquery-ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png b/saclay_static/jquery-ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2..5b5dab2 100644
--- a/static/jquery-ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/static/jquery-ui/base/images/ui-bg_flat_75_ffffff_40x100.png b/saclay_static/jquery-ui/base/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229..ac8b229 100644
--- a/static/jquery-ui/base/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png
index ad3d634..ad3d634 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_65_ffffff_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_65_ffffff_1x400.png
index 42ccba2..42ccba2 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_75_dadada_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_75_dadada_1x400.png
index 5a46b47..5a46b47 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_75_dadada_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png
index 86c2baa..86c2baa 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_glass_95_fef1ec_1x400.png b/saclay_static/jquery-ui/base/images/ui-bg_glass_95_fef1ec_1x400.png
index 4443fdc..4443fdc 100644
--- a/static/jquery-ui/base/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/static/jquery-ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/saclay_static/jquery-ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7c9fa6c..7c9fa6c 100644
--- a/static/jquery-ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/saclay_static/jquery-ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/static/jquery-ui/base/images/ui-icons_222222_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_222222_256x240.png
index ee039dc..ee039dc 100644
--- a/static/jquery-ui/base/images/ui-icons_222222_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_222222_256x240.png
diff --git a/static/jquery-ui/base/images/ui-icons_2e83ff_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_2e83ff_256x240.png
index 45e8928..45e8928 100644
--- a/static/jquery-ui/base/images/ui-icons_2e83ff_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_2e83ff_256x240.png
diff --git a/static/jquery-ui/base/images/ui-icons_454545_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_454545_256x240.png
index 7ec70d1..7ec70d1 100644
--- a/static/jquery-ui/base/images/ui-icons_454545_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_454545_256x240.png
diff --git a/static/jquery-ui/base/images/ui-icons_888888_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_888888_256x240.png
index 5ba708c..5ba708c 100644
--- a/static/jquery-ui/base/images/ui-icons_888888_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_888888_256x240.png
diff --git a/static/jquery-ui/base/images/ui-icons_cd0a0a_256x240.png b/saclay_static/jquery-ui/base/images/ui-icons_cd0a0a_256x240.png
index 7930a55..7930a55 100644
--- a/static/jquery-ui/base/images/ui-icons_cd0a0a_256x240.png
+++ b/saclay_static/jquery-ui/base/images/ui-icons_cd0a0a_256x240.png
diff --git a/static/jquery-ui/base/jquery-ui.css b/saclay_static/jquery-ui/base/jquery-ui.css
index c0afe83..c0afe83 100644
--- a/static/jquery-ui/base/jquery-ui.css
+++ b/saclay_static/jquery-ui/base/jquery-ui.css
diff --git a/static/jquery-ui/base/jquery.ui.accordion.css b/saclay_static/jquery-ui/base/jquery.ui.accordion.css
index 5d79383..5d79383 100644
--- a/static/jquery-ui/base/jquery.ui.accordion.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.accordion.css
diff --git a/static/jquery-ui/base/jquery.ui.all.css b/saclay_static/jquery-ui/base/jquery.ui.all.css
index 351e0d8..351e0d8 100644
--- a/static/jquery-ui/base/jquery.ui.all.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.all.css
diff --git a/static/jquery-ui/base/jquery.ui.autocomplete.css b/saclay_static/jquery-ui/base/jquery.ui.autocomplete.css
index 1c6ab97..1c6ab97 100644
--- a/static/jquery-ui/base/jquery.ui.autocomplete.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.autocomplete.css
diff --git a/static/jquery-ui/base/jquery.ui.base.css b/saclay_static/jquery-ui/base/jquery.ui.base.css
index aefb565..aefb565 100644
--- a/static/jquery-ui/base/jquery.ui.base.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.base.css
diff --git a/static/jquery-ui/base/jquery.ui.button.css b/saclay_static/jquery-ui/base/jquery.ui.button.css
index 1a92496..1a92496 100644
--- a/static/jquery-ui/base/jquery.ui.button.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.button.css
diff --git a/static/jquery-ui/base/jquery.ui.core.css b/saclay_static/jquery-ui/base/jquery.ui.core.css
index 97c9696..97c9696 100644
--- a/static/jquery-ui/base/jquery.ui.core.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.core.css
diff --git a/static/jquery-ui/base/jquery.ui.datepicker.css b/saclay_static/jquery-ui/base/jquery.ui.datepicker.css
index c20aecc..c20aecc 100644
--- a/static/jquery-ui/base/jquery.ui.datepicker.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.datepicker.css
diff --git a/static/jquery-ui/base/jquery.ui.dialog.css b/saclay_static/jquery-ui/base/jquery.ui.dialog.css
index 6ebd1cf..6ebd1cf 100644
--- a/static/jquery-ui/base/jquery.ui.dialog.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.dialog.css
diff --git a/static/jquery-ui/base/jquery.ui.menu.css b/saclay_static/jquery-ui/base/jquery.ui.menu.css
index 0ffa1e0..0ffa1e0 100644
--- a/static/jquery-ui/base/jquery.ui.menu.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.menu.css
diff --git a/static/jquery-ui/base/jquery.ui.progressbar.css b/saclay_static/jquery-ui/base/jquery.ui.progressbar.css
index f8980a5..f8980a5 100644
--- a/static/jquery-ui/base/jquery.ui.progressbar.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.progressbar.css
diff --git a/static/jquery-ui/base/jquery.ui.resizable.css b/saclay_static/jquery-ui/base/jquery.ui.resizable.css
index eeb47a7..eeb47a7 100644
--- a/static/jquery-ui/base/jquery.ui.resizable.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.resizable.css
diff --git a/static/jquery-ui/base/jquery.ui.selectable.css b/saclay_static/jquery-ui/base/jquery.ui.selectable.css
index bb388eb..bb388eb 100644
--- a/static/jquery-ui/base/jquery.ui.selectable.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.selectable.css
diff --git a/static/jquery-ui/base/jquery.ui.slider.css b/saclay_static/jquery-ui/base/jquery.ui.slider.css
index 662912d..662912d 100644
--- a/static/jquery-ui/base/jquery.ui.slider.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.slider.css
diff --git a/static/jquery-ui/base/jquery.ui.spinner.css b/saclay_static/jquery-ui/base/jquery.ui.spinner.css
index 1a298a4..1a298a4 100644
--- a/static/jquery-ui/base/jquery.ui.spinner.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.spinner.css
diff --git a/static/jquery-ui/base/jquery.ui.tabs.css b/saclay_static/jquery-ui/base/jquery.ui.tabs.css
index f3990a4..f3990a4 100644
--- a/static/jquery-ui/base/jquery.ui.tabs.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.tabs.css
diff --git a/static/jquery-ui/base/jquery.ui.theme.css b/saclay_static/jquery-ui/base/jquery.ui.theme.css
index b5ef1ce..b5ef1ce 100644
--- a/static/jquery-ui/base/jquery.ui.theme.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.theme.css
diff --git a/static/jquery-ui/base/jquery.ui.tooltip.css b/saclay_static/jquery-ui/base/jquery.ui.tooltip.css
index bede6fc..bede6fc 100644
--- a/static/jquery-ui/base/jquery.ui.tooltip.css
+++ b/saclay_static/jquery-ui/base/jquery.ui.tooltip.css
diff --git a/static/jquery-ui/copyright b/saclay_static/jquery-ui/copyright
index 25d7a9b..25d7a9b 100644
--- a/static/jquery-ui/copyright
+++ b/saclay_static/jquery-ui/copyright
diff --git a/static/jquery-ui/jquery-ui.min.js b/saclay_static/jquery-ui/jquery-ui.min.js
index 7a1383e..7a1383e 100644
--- a/static/jquery-ui/jquery-ui.min.js
+++ b/saclay_static/jquery-ui/jquery-ui.min.js
diff --git a/static/jquery-ui/smoothness/images/animated-overlay.gif b/saclay_static/jquery-ui/smoothness/images/animated-overlay.gif
index d441f75..d441f75 100644
--- a/static/jquery-ui/smoothness/images/animated-overlay.gif
+++ b/saclay_static/jquery-ui/smoothness/images/animated-overlay.gif
diff --git a/static/jquery-ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
index c06ecaa..c06ecaa 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
index db28c75..db28c75 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
index 137b9d2..137b9d2 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
index 0dc2feb..0dc2feb 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
index c6b94b6..c6b94b6 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
index d99dd51..d99dd51 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
index 8e40834..8e40834 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/static/jquery-ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/saclay_static/jquery-ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 4359bc3..4359bc3 100644
--- a/static/jquery-ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_222222_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_222222_256x240.png
index 43bf16e..43bf16e 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_222222_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_222222_256x240.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_2e83ff_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_2e83ff_256x240.png
index 4af3763..4af3763 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_2e83ff_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_454545_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_454545_256x240.png
index 77628c6..77628c6 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_454545_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_454545_256x240.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_888888_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_888888_256x240.png
index dac466f..dac466f 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_888888_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_888888_256x240.png
diff --git a/static/jquery-ui/smoothness/images/ui-icons_cd0a0a_256x240.png b/saclay_static/jquery-ui/smoothness/images/ui-icons_cd0a0a_256x240.png
index 61827f0..61827f0 100644
--- a/static/jquery-ui/smoothness/images/ui-icons_cd0a0a_256x240.png
+++ b/saclay_static/jquery-ui/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.css b/saclay_static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.css
index 82c40fc..82c40fc 100644
--- a/static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.css
+++ b/saclay_static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.css
diff --git a/static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.min.css b/saclay_static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.min.css
index 7442c5f..7442c5f 100644
--- a/static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.min.css
+++ b/saclay_static/jquery-ui/smoothness/jquery-ui-1.10.1.custom.min.css
diff --git a/static/jquery-ui/smoothness/jquery-ui.css b/saclay_static/jquery-ui/smoothness/jquery-ui.css
index 8784a02..8784a02 120000
--- a/static/jquery-ui/smoothness/jquery-ui.css
+++ b/saclay_static/jquery-ui/smoothness/jquery-ui.css
diff --git a/static/jquery-ui/smoothness/jquery-ui.min.css b/saclay_static/jquery-ui/smoothness/jquery-ui.min.css
index a57eb75..a57eb75 120000
--- a/static/jquery-ui/smoothness/jquery-ui.min.css
+++ b/saclay_static/jquery-ui/smoothness/jquery-ui.min.css
diff --git a/static/jquery/copyright b/saclay_static/jquery/copyright
index 3d2d52d..3d2d52d 100644
--- a/static/jquery/copyright
+++ b/saclay_static/jquery/copyright
diff --git a/static/jquery/jquery.min.js b/saclay_static/jquery/jquery.min.js
index 4d24ba4..4d24ba4 100644
--- a/static/jquery/jquery.min.js
+++ b/saclay_static/jquery/jquery.min.js
diff --git a/static/saclay/css/mobile.css b/saclay_static/saclay/css/mobile.css
index ee31e25..ee31e25 100644
--- a/static/saclay/css/mobile.css
+++ b/saclay_static/saclay/css/mobile.css
diff --git a/static/saclay/css/print.css b/saclay_static/saclay/css/print.css
index 919fe8d..919fe8d 100644
--- a/static/saclay/css/print.css
+++ b/saclay_static/saclay/css/print.css
diff --git a/static/saclay/css/styles.css b/saclay_static/saclay/css/styles.css
index 39db464..1d2255a 100644
--- a/static/saclay/css/styles.css
+++ b/saclay_static/saclay/css/styles.css
@@ -1140,7 +1140,7 @@ div#sidebar{
 
 div#sidebar{
     z-index:7;
-    width:281px;
+    width:295px;
     top:26px;
     position:absolute;
     bottom:0;
@@ -1202,10 +1202,10 @@ ul.share {
     padding:3px;
     bottom:0;
     position:absolute;
-    width:276px;
-    height:22px;
     border-right:1px solid #999;
     border-left:1px solid #999;
+    width: 281px;
+    height: 26px;
 }
 
 .sidebar-handler{
@@ -1307,10 +1307,9 @@ ul#ul_categories{
 }
 
 #ul_categories .subcategories li label{
-    width:274px;
     display:block;
-    padding:5px 0 0 9px;
-    height:21px;
+    padding:0.5em 1em;
+    margin:0;
     font-weight:bold;
     background-color:#fff;
 }
@@ -1772,7 +1771,7 @@ div.cloud h4{
 .close_img{
     display:block;
     overflow:hidden;
-    width:351px;
+    width: 100%;
     height:22px;
     background-image:url(../images/popup/close.png);
     background-position:center;
@@ -2036,6 +2035,22 @@ select#id_categories{
     margin-top:20%;
 }
 
+#categories li{
+    padding: 0;
+}
+
+#categories li.main_category:hover{
+    background-color: transparent;
+}
+
+.subcategory label{
+    border-radius: 0;
+}
+
+.main_category > span > label{
+    width: 100%;
+}
+
 .main_category.toggle_plus > span > label,
 .main_category.toggle_minus > span > label{
     text-transform:uppercase;
@@ -2171,3 +2186,16 @@ a#page-feedback{
     font-size: 0;
     color: 0;
 }
+
+#detail_footer{
+    border-radius-bottom: 6px;
+}
+
+.popover h4{
+    padding: 0.5em 1em;
+}
+
+.popover,
+.popover-content{
+    padding: 0;
+}
diff --git a/static/saclay/images/background-small.png b/saclay_static/saclay/images/background-small.png
index fc904ae..fc904ae 100644
--- a/static/saclay/images/background-small.png
+++ b/saclay_static/saclay/images/background-small.png
diff --git a/static/saclay/images/background-top.png b/saclay_static/saclay/images/background-top.png
index c7fb8e1..c7fb8e1 100644
--- a/static/saclay/images/background-top.png
+++ b/saclay_static/saclay/images/background-top.png
diff --git a/static/saclay/images/background.png b/saclay_static/saclay/images/background.png
index 564dbf4..564dbf4 100644
--- a/static/saclay/images/background.png
+++ b/saclay_static/saclay/images/background.png
diff --git a/static/saclay/images/bottom-arrow.png b/saclay_static/saclay/images/bottom-arrow.png
index 6f98166..6f98166 100644
--- a/static/saclay/images/bottom-arrow.png
+++ b/saclay_static/saclay/images/bottom-arrow.png
diff --git a/static/saclay/images/button-cat-off.png b/saclay_static/saclay/images/button-cat-off.png
index ad9e0e5..ad9e0e5 100644
--- a/static/saclay/images/button-cat-off.png
+++ b/saclay_static/saclay/images/button-cat-off.png
diff --git a/static/saclay/images/button-cat-on.png b/saclay_static/saclay/images/button-cat-on.png
index 3c6c546..3c6c546 100644
--- a/static/saclay/images/button-cat-on.png
+++ b/saclay_static/saclay/images/button-cat-on.png
diff --git a/static/saclay/images/button-cat-three-off.png b/saclay_static/saclay/images/button-cat-three-off.png
index 9d728de..9d728de 100644
--- a/static/saclay/images/button-cat-three-off.png
+++ b/saclay_static/saclay/images/button-cat-three-off.png
diff --git a/static/saclay/images/button-cat-three-on.png b/saclay_static/saclay/images/button-cat-three-on.png
index d9bcc7e..d9bcc7e 100644
--- a/static/saclay/images/button-cat-three-on.png
+++ b/saclay_static/saclay/images/button-cat-three-on.png
diff --git a/static/saclay/images/button-event-off.png b/saclay_static/saclay/images/button-event-off.png
index 34a64a6..34a64a6 100644
--- a/static/saclay/images/button-event-off.png
+++ b/saclay_static/saclay/images/button-event-off.png
diff --git a/static/saclay/images/button-event-on.png b/saclay_static/saclay/images/button-event-on.png
index cdfc2cb..cdfc2cb 100644
--- a/static/saclay/images/button-event-on.png
+++ b/saclay_static/saclay/images/button-event-on.png
diff --git a/static/saclay/images/button-location-off.png b/saclay_static/saclay/images/button-location-off.png
index 4fb3ec3..4fb3ec3 100644
--- a/static/saclay/images/button-location-off.png
+++ b/saclay_static/saclay/images/button-location-off.png
diff --git a/static/saclay/images/button-location-on.png b/saclay_static/saclay/images/button-location-on.png
index 33f60fb..33f60fb 100644
--- a/static/saclay/images/button-location-on.png
+++ b/saclay_static/saclay/images/button-location-on.png
diff --git a/static/saclay/images/button-map-off.png b/saclay_static/saclay/images/button-map-off.png
index d9166a6..d9166a6 100644
--- a/static/saclay/images/button-map-off.png
+++ b/saclay_static/saclay/images/button-map-off.png
diff --git a/static/saclay/images/button-map-on.png b/saclay_static/saclay/images/button-map-on.png
index ff8d122..ff8d122 100644
--- a/static/saclay/images/button-map-on.png
+++ b/saclay_static/saclay/images/button-map-on.png
diff --git a/static/saclay/images/button-news-off.png b/saclay_static/saclay/images/button-news-off.png
index 91d426e..91d426e 100644
--- a/static/saclay/images/button-news-off.png
+++ b/saclay_static/saclay/images/button-news-off.png
diff --git a/static/saclay/images/button-news-on.png b/saclay_static/saclay/images/button-news-on.png
index 377c266..377c266 100644
--- a/static/saclay/images/button-news-on.png
+++ b/saclay_static/saclay/images/button-news-on.png
diff --git a/static/saclay/images/button-participate-off.png b/saclay_static/saclay/images/button-participate-off.png
index 0c5d1cd..0c5d1cd 100644
--- a/static/saclay/images/button-participate-off.png
+++ b/saclay_static/saclay/images/button-participate-off.png
diff --git a/static/saclay/images/button-participate-on.png b/saclay_static/saclay/images/button-participate-on.png
index e8c03b8..e8c03b8 100644
--- a/static/saclay/images/button-participate-on.png
+++ b/saclay_static/saclay/images/button-participate-on.png
diff --git a/static/saclay/images/button-project-off.png b/saclay_static/saclay/images/button-project-off.png
index 35aea1c..35aea1c 100644
--- a/static/saclay/images/button-project-off.png
+++ b/saclay_static/saclay/images/button-project-off.png
diff --git a/static/saclay/images/button-project-on.png b/saclay_static/saclay/images/button-project-on.png
index 6b84d07..6b84d07 100644
--- a/static/saclay/images/button-project-on.png
+++ b/saclay_static/saclay/images/button-project-on.png
diff --git a/static/saclay/images/button-route-off.png b/saclay_static/saclay/images/button-route-off.png
index 91c057c..91c057c 100644
--- a/static/saclay/images/button-route-off.png
+++ b/saclay_static/saclay/images/button-route-off.png
diff --git a/static/saclay/images/button-route-on.png b/saclay_static/saclay/images/button-route-on.png
index c159e34..c159e34 100644
--- a/static/saclay/images/button-route-on.png
+++ b/saclay_static/saclay/images/button-route-on.png
diff --git a/static/saclay/images/button-route-three-off.png b/saclay_static/saclay/images/button-route-three-off.png
index 388fd9d..388fd9d 100644
--- a/static/saclay/images/button-route-three-off.png
+++ b/saclay_static/saclay/images/button-route-three-off.png
diff --git a/static/saclay/images/button-route-three-on.png b/saclay_static/saclay/images/button-route-three-on.png
index 9581525..9581525 100644
--- a/static/saclay/images/button-route-three-on.png
+++ b/saclay_static/saclay/images/button-route-three-on.png
diff --git a/static/saclay/images/button-search-off.png b/saclay_static/saclay/images/button-search-off.png
index 9188039..9188039 100644
--- a/static/saclay/images/button-search-off.png
+++ b/saclay_static/saclay/images/button-search-off.png
diff --git a/static/saclay/images/button-search-on.png b/saclay_static/saclay/images/button-search-on.png
index b7ed487..b7ed487 100644
--- a/static/saclay/images/button-search-on.png
+++ b/saclay_static/saclay/images/button-search-on.png
diff --git a/static/saclay/images/button-wander-off.png b/saclay_static/saclay/images/button-wander-off.png
index 729f825..729f825 100644
--- a/static/saclay/images/button-wander-off.png
+++ b/saclay_static/saclay/images/button-wander-off.png
diff --git a/static/saclay/images/button-wander-on.png b/saclay_static/saclay/images/button-wander-on.png
index 0223f35..0223f35 100644
--- a/static/saclay/images/button-wander-on.png
+++ b/saclay_static/saclay/images/button-wander-on.png
diff --git a/static/saclay/images/buttons/add.png b/saclay_static/saclay/images/buttons/add.png
index 3368a65..3368a65 100644
--- a/static/saclay/images/buttons/add.png
+++ b/saclay_static/saclay/images/buttons/add.png
diff --git a/static/saclay/images/buttons/add_event.png b/saclay_static/saclay/images/buttons/add_event.png
index a5976f9..a5976f9 100644
--- a/static/saclay/images/buttons/add_event.png
+++ b/saclay_static/saclay/images/buttons/add_event.png
diff --git a/static/saclay/images/buttons/add_location.png b/saclay_static/saclay/images/buttons/add_location.png
index d0084d6..d0084d6 100644
--- a/static/saclay/images/buttons/add_location.png
+++ b/saclay_static/saclay/images/buttons/add_location.png
diff --git a/static/saclay/images/buttons/add_wander.png b/saclay_static/saclay/images/buttons/add_wander.png
index fb2d39a..fb2d39a 100644
--- a/static/saclay/images/buttons/add_wander.png
+++ b/saclay_static/saclay/images/buttons/add_wander.png
diff --git a/static/saclay/images/buttons/bicycle.png b/saclay_static/saclay/images/buttons/bicycle.png
index b408275..b408275 100644
--- a/static/saclay/images/buttons/bicycle.png
+++ b/saclay_static/saclay/images/buttons/bicycle.png
diff --git a/static/saclay/images/buttons/bicycle_on.png b/saclay_static/saclay/images/buttons/bicycle_on.png
index 65e5e4c..65e5e4c 100644
--- a/static/saclay/images/buttons/bicycle_on.png
+++ b/saclay_static/saclay/images/buttons/bicycle_on.png
diff --git a/static/saclay/images/buttons/button-help-off.png b/saclay_static/saclay/images/buttons/button-help-off.png
index aa98621..aa98621 100644
--- a/static/saclay/images/buttons/button-help-off.png
+++ b/saclay_static/saclay/images/buttons/button-help-off.png
diff --git a/static/saclay/images/buttons/button-help-on.png b/saclay_static/saclay/images/buttons/button-help-on.png
index aa98621..aa98621 100644
--- a/static/saclay/images/buttons/button-help-on.png
+++ b/saclay_static/saclay/images/buttons/button-help-on.png
diff --git a/static/saclay/images/buttons/button-print-off.png b/saclay_static/saclay/images/buttons/button-print-off.png
index a01b1fc..a01b1fc 100644
--- a/static/saclay/images/buttons/button-print-off.png
+++ b/saclay_static/saclay/images/buttons/button-print-off.png
diff --git a/static/saclay/images/buttons/button-print-on.png b/saclay_static/saclay/images/buttons/button-print-on.png
index a01b1fc..a01b1fc 100644
--- a/static/saclay/images/buttons/button-print-on.png
+++ b/saclay_static/saclay/images/buttons/button-print-on.png
diff --git a/static/saclay/images/buttons/button-send-off.png b/saclay_static/saclay/images/buttons/button-send-off.png
index e8a315c..e8a315c 100644
--- a/static/saclay/images/buttons/button-send-off.png
+++ b/saclay_static/saclay/images/buttons/button-send-off.png
diff --git a/static/saclay/images/buttons/button-send-on.png b/saclay_static/saclay/images/buttons/button-send-on.png
index e8a315c..e8a315c 100644
--- a/static/saclay/images/buttons/button-send-on.png
+++ b/saclay_static/saclay/images/buttons/button-send-on.png
diff --git a/static/saclay/images/buttons/button-share-off.png b/saclay_static/saclay/images/buttons/button-share-off.png
index 232efc3..232efc3 100644
--- a/static/saclay/images/buttons/button-share-off.png
+++ b/saclay_static/saclay/images/buttons/button-share-off.png
diff --git a/static/saclay/images/buttons/button-share-on.png b/saclay_static/saclay/images/buttons/button-share-on.png
index 232efc3..232efc3 100644
--- a/static/saclay/images/buttons/button-share-on.png
+++ b/saclay_static/saclay/images/buttons/button-share-on.png
diff --git a/static/saclay/images/buttons/calendar.png b/saclay_static/saclay/images/buttons/calendar.png
index 8d4bfc8..8d4bfc8 100644
--- a/static/saclay/images/buttons/calendar.png
+++ b/saclay_static/saclay/images/buttons/calendar.png
diff --git a/static/saclay/images/buttons/download.png b/saclay_static/saclay/images/buttons/download.png
index 33c92bc..33c92bc 100644
--- a/static/saclay/images/buttons/download.png
+++ b/saclay_static/saclay/images/buttons/download.png
diff --git a/static/saclay/images/buttons/extra_criteria-open.png b/saclay_static/saclay/images/buttons/extra_criteria-open.png
index 88d7d5e..88d7d5e 100644
--- a/static/saclay/images/buttons/extra_criteria-open.png
+++ b/saclay_static/saclay/images/buttons/extra_criteria-open.png
diff --git a/static/saclay/images/buttons/extra_criteria.png b/saclay_static/saclay/images/buttons/extra_criteria.png
index c4551ab..c4551ab 100644
--- a/static/saclay/images/buttons/extra_criteria.png
+++ b/saclay_static/saclay/images/buttons/extra_criteria.png
diff --git a/static/saclay/images/buttons/finish.png b/saclay_static/saclay/images/buttons/finish.png
index 840bdb4..840bdb4 100644
--- a/static/saclay/images/buttons/finish.png
+++ b/saclay_static/saclay/images/buttons/finish.png
diff --git a/static/saclay/images/buttons/form_finish.png b/saclay_static/saclay/images/buttons/form_finish.png
index 3f36f3b..3f36f3b 100644
--- a/static/saclay/images/buttons/form_finish.png
+++ b/saclay_static/saclay/images/buttons/form_finish.png
diff --git a/static/saclay/images/buttons/form_start.png b/saclay_static/saclay/images/buttons/form_start.png
index 0f81d93..0f81d93 100644
--- a/static/saclay/images/buttons/form_start.png
+++ b/saclay_static/saclay/images/buttons/form_start.png
diff --git a/static/saclay/images/buttons/form_step.png b/saclay_static/saclay/images/buttons/form_step.png
index 61a5d1d..61a5d1d 100644
--- a/static/saclay/images/buttons/form_step.png
+++ b/saclay_static/saclay/images/buttons/form_step.png
diff --git a/static/saclay/images/buttons/modify.png b/saclay_static/saclay/images/buttons/modify.png
index 3a4aebd..3a4aebd 100644
--- a/static/saclay/images/buttons/modify.png
+++ b/saclay_static/saclay/images/buttons/modify.png
diff --git a/static/saclay/images/buttons/new_search.png b/saclay_static/saclay/images/buttons/new_search.png
index 18ea372..18ea372 100644
--- a/static/saclay/images/buttons/new_search.png
+++ b/saclay_static/saclay/images/buttons/new_search.png
diff --git a/static/saclay/images/buttons/search.png b/saclay_static/saclay/images/buttons/search.png
index 3e94445..3e94445 100644
--- a/static/saclay/images/buttons/search.png
+++ b/saclay_static/saclay/images/buttons/search.png
diff --git a/static/saclay/images/buttons/start.png b/saclay_static/saclay/images/buttons/start.png
index 0e211f4..0e211f4 100644
--- a/static/saclay/images/buttons/start.png
+++ b/saclay_static/saclay/images/buttons/start.png
diff --git a/static/saclay/images/buttons/validate.png b/saclay_static/saclay/images/buttons/validate.png
index 8c03952..8c03952 100644
--- a/static/saclay/images/buttons/validate.png
+++ b/saclay_static/saclay/images/buttons/validate.png
diff --git a/static/saclay/images/buttons/walk.png b/saclay_static/saclay/images/buttons/walk.png
index a36b071..a36b071 100644
--- a/static/saclay/images/buttons/walk.png
+++ b/saclay_static/saclay/images/buttons/walk.png
diff --git a/static/saclay/images/buttons/walk_on.png b/saclay_static/saclay/images/buttons/walk_on.png
index 7ae81d8..7ae81d8 100644
--- a/static/saclay/images/buttons/walk_on.png
+++ b/saclay_static/saclay/images/buttons/walk_on.png
diff --git a/static/saclay/images/categories/cat_agri.png b/saclay_static/saclay/images/categories/cat_agri.png
index 4fd1536..4fd1536 100644
--- a/static/saclay/images/categories/cat_agri.png
+++ b/saclay_static/saclay/images/categories/cat_agri.png
diff --git a/static/saclay/images/categories/cat_agri_on.png b/saclay_static/saclay/images/categories/cat_agri_on.png
index a46323f..a46323f 100644
--- a/static/saclay/images/categories/cat_agri_on.png
+++ b/saclay_static/saclay/images/categories/cat_agri_on.png
diff --git a/static/saclay/images/categories/cat_balade.png b/saclay_static/saclay/images/categories/cat_balade.png
index 475be6f..475be6f 100644
--- a/static/saclay/images/categories/cat_balade.png
+++ b/saclay_static/saclay/images/categories/cat_balade.png
diff --git a/static/saclay/images/categories/cat_balade_on.png b/saclay_static/saclay/images/categories/cat_balade_on.png
index 8d1ec8a..8d1ec8a 100644
--- a/static/saclay/images/categories/cat_balade_on.png
+++ b/saclay_static/saclay/images/categories/cat_balade_on.png
diff --git a/static/saclay/images/categories/cat_culture.png b/saclay_static/saclay/images/categories/cat_culture.png
index c77a136..c77a136 100644
--- a/static/saclay/images/categories/cat_culture.png
+++ b/saclay_static/saclay/images/categories/cat_culture.png
diff --git a/static/saclay/images/categories/cat_culture_on.png b/saclay_static/saclay/images/categories/cat_culture_on.png
index 175b0a7..175b0a7 100644
--- a/static/saclay/images/categories/cat_culture_on.png
+++ b/saclay_static/saclay/images/categories/cat_culture_on.png
diff --git a/static/saclay/images/categories/cat_event.png b/saclay_static/saclay/images/categories/cat_event.png
index 5e942d7..5e942d7 100644
--- a/static/saclay/images/categories/cat_event.png
+++ b/saclay_static/saclay/images/categories/cat_event.png
diff --git a/static/saclay/images/categories/cat_event_on.png b/saclay_static/saclay/images/categories/cat_event_on.png
index d51ced1..d51ced1 100644
--- a/static/saclay/images/categories/cat_event_on.png
+++ b/saclay_static/saclay/images/categories/cat_event_on.png
diff --git a/static/saclay/images/categories/cat_mobilites.png b/saclay_static/saclay/images/categories/cat_mobilites.png
index c678b55..c678b55 100644
--- a/static/saclay/images/categories/cat_mobilites.png
+++ b/saclay_static/saclay/images/categories/cat_mobilites.png
diff --git a/static/saclay/images/categories/cat_mobilites_on.png b/saclay_static/saclay/images/categories/cat_mobilites_on.png
index 9bdb1a8..9bdb1a8 100644
--- a/static/saclay/images/categories/cat_mobilites_on.png
+++ b/saclay_static/saclay/images/categories/cat_mobilites_on.png
diff --git a/static/saclay/images/categories/cat_patrimoine.png b/saclay_static/saclay/images/categories/cat_patrimoine.png
index 6cb5d22..6cb5d22 100644
--- a/static/saclay/images/categories/cat_patrimoine.png
+++ b/saclay_static/saclay/images/categories/cat_patrimoine.png
diff --git a/static/saclay/images/categories/cat_patrimoine_on.png b/saclay_static/saclay/images/categories/cat_patrimoine_on.png
index 34592d9..34592d9 100644
--- a/static/saclay/images/categories/cat_patrimoine_on.png
+++ b/saclay_static/saclay/images/categories/cat_patrimoine_on.png
diff --git a/static/saclay/images/categories/cat_pratique.png b/saclay_static/saclay/images/categories/cat_pratique.png
index 17e145b..17e145b 100644
--- a/static/saclay/images/categories/cat_pratique.png
+++ b/saclay_static/saclay/images/categories/cat_pratique.png
diff --git a/static/saclay/images/categories/cat_pratique_on.png b/saclay_static/saclay/images/categories/cat_pratique_on.png
index c2629d8..c2629d8 100644
--- a/static/saclay/images/categories/cat_pratique_on.png
+++ b/saclay_static/saclay/images/categories/cat_pratique_on.png
diff --git a/static/saclay/images/categories/cat_sport.png b/saclay_static/saclay/images/categories/cat_sport.png
index 74c6971..74c6971 100644
--- a/static/saclay/images/categories/cat_sport.png
+++ b/saclay_static/saclay/images/categories/cat_sport.png
diff --git a/static/saclay/images/categories/cat_sport_on.png b/saclay_static/saclay/images/categories/cat_sport_on.png
index a18ebf9..a18ebf9 100644
--- a/static/saclay/images/categories/cat_sport_on.png
+++ b/saclay_static/saclay/images/categories/cat_sport_on.png
diff --git a/static/saclay/images/check-active.png b/saclay_static/saclay/images/check-active.png
index f787c3f..f787c3f 100644
--- a/static/saclay/images/check-active.png
+++ b/saclay_static/saclay/images/check-active.png
diff --git a/static/saclay/images/check-small.png b/saclay_static/saclay/images/check-small.png
index ce5f565..ce5f565 100644
--- a/static/saclay/images/check-small.png
+++ b/saclay_static/saclay/images/check-small.png
diff --git a/static/saclay/images/check.png b/saclay_static/saclay/images/check.png
index 75a1eb0..75a1eb0 100644
--- a/static/saclay/images/check.png
+++ b/saclay_static/saclay/images/check.png
diff --git a/static/saclay/images/close.png b/saclay_static/saclay/images/close.png
index 0b356df..0b356df 100644
--- a/static/saclay/images/close.png
+++ b/saclay_static/saclay/images/close.png
diff --git a/static/saclay/images/cloud-popup-saclay.png b/saclay_static/saclay/images/cloud-popup-saclay.png
index 9e4de73..9e4de73 100755
--- a/static/saclay/images/cloud-popup-saclay.png
+++ b/saclay_static/saclay/images/cloud-popup-saclay.png
diff --git a/static/saclay/images/cloud-popup-saclay.xcf b/saclay_static/saclay/images/cloud-popup-saclay.xcf
index 797be2c..797be2c 100644
--- a/static/saclay/images/cloud-popup-saclay.xcf
+++ b/saclay_static/saclay/images/cloud-popup-saclay.xcf
diff --git a/static/saclay/images/cluster_icon.png b/saclay_static/saclay/images/cluster_icon.png
index d019e11..d019e11 100644
--- a/static/saclay/images/cluster_icon.png
+++ b/saclay_static/saclay/images/cluster_icon.png
diff --git a/static/saclay/images/cluster_icon_hover.png b/saclay_static/saclay/images/cluster_icon_hover.png
index 7901f41..7901f41 100644
--- a/static/saclay/images/cluster_icon_hover.png
+++ b/saclay_static/saclay/images/cluster_icon_hover.png
diff --git a/static/saclay/images/default_icon.png b/saclay_static/saclay/images/default_icon.png
index 7d98be8..7d98be8 100644
--- a/static/saclay/images/default_icon.png
+++ b/saclay_static/saclay/images/default_icon.png
diff --git a/static/saclay/images/display_option.png b/saclay_static/saclay/images/display_option.png
index b5a7550..b5a7550 100644
--- a/static/saclay/images/display_option.png
+++ b/saclay_static/saclay/images/display_option.png
diff --git a/static/saclay/images/display_option_open.png b/saclay_static/saclay/images/display_option_open.png
index 2aa5599..2aa5599 100644
--- a/static/saclay/images/display_option_open.png
+++ b/saclay_static/saclay/images/display_option_open.png
diff --git a/static/saclay/images/email.png b/saclay_static/saclay/images/email.png
index 8eea702..8eea702 100644
--- a/static/saclay/images/email.png
+++ b/saclay_static/saclay/images/email.png
diff --git a/static/saclay/images/favicon.png b/saclay_static/saclay/images/favicon.png
index 6073276..6073276 100644
--- a/static/saclay/images/favicon.png
+++ b/saclay_static/saclay/images/favicon.png
diff --git a/static/saclay/images/handler-hide.png b/saclay_static/saclay/images/handler-hide.png
index 844300a..844300a 100644
--- a/static/saclay/images/handler-hide.png
+++ b/saclay_static/saclay/images/handler-hide.png
diff --git a/static/saclay/images/handler-show.png b/saclay_static/saclay/images/handler-show.png
index f258f87..f258f87 100644
--- a/static/saclay/images/handler-show.png
+++ b/saclay_static/saclay/images/handler-show.png
diff --git a/static/saclay/images/logo.jpg b/saclay_static/saclay/images/logo.jpg
index 070c9c9..070c9c9 100644
--- a/static/saclay/images/logo.jpg
+++ b/saclay_static/saclay/images/logo.jpg
diff --git a/static/saclay/images/map_sprite.png b/saclay_static/saclay/images/map_sprite.png
index 026a334..026a334 100644
--- a/static/saclay/images/map_sprite.png
+++ b/saclay_static/saclay/images/map_sprite.png
diff --git a/static/saclay/images/menu/icon_add.png b/saclay_static/saclay/images/menu/icon_add.png
index 8ad2e8d..8ad2e8d 100644
--- a/static/saclay/images/menu/icon_add.png
+++ b/saclay_static/saclay/images/menu/icon_add.png
diff --git a/static/saclay/images/menu/icon_center.png b/saclay_static/saclay/images/menu/icon_center.png
index 2d3ade4..2d3ade4 100644
--- a/static/saclay/images/menu/icon_center.png
+++ b/saclay_static/saclay/images/menu/icon_center.png
diff --git a/static/saclay/images/menu/icon_from.png b/saclay_static/saclay/images/menu/icon_from.png
index 3623e50..3623e50 100644
--- a/static/saclay/images/menu/icon_from.png
+++ b/saclay_static/saclay/images/menu/icon_from.png
diff --git a/static/saclay/images/menu/icon_minus.png b/saclay_static/saclay/images/menu/icon_minus.png
index 613169a..613169a 100644
--- a/static/saclay/images/menu/icon_minus.png
+++ b/saclay_static/saclay/images/menu/icon_minus.png
diff --git a/static/saclay/images/menu/icon_plus.png b/saclay_static/saclay/images/menu/icon_plus.png
index a02228e..a02228e 100644
--- a/static/saclay/images/menu/icon_plus.png
+++ b/saclay_static/saclay/images/menu/icon_plus.png
diff --git a/static/saclay/images/menu/icon_to.png b/saclay_static/saclay/images/menu/icon_to.png
index 6a2bab2..6a2bab2 100644
--- a/static/saclay/images/menu/icon_to.png
+++ b/saclay_static/saclay/images/menu/icon_to.png
diff --git a/static/saclay/images/minus.png b/saclay_static/saclay/images/minus.png
index 05b4170..05b4170 100644
--- a/static/saclay/images/minus.png
+++ b/saclay_static/saclay/images/minus.png
diff --git a/static/saclay/images/minus_alt.png b/saclay_static/saclay/images/minus_alt.png
index 787b8eb..787b8eb 100644
--- a/static/saclay/images/minus_alt.png
+++ b/saclay_static/saclay/images/minus_alt.png
diff --git a/static/saclay/images/minus_on.png b/saclay_static/saclay/images/minus_on.png
index 6af094b..6af094b 100644
--- a/static/saclay/images/minus_on.png
+++ b/saclay_static/saclay/images/minus_on.png
diff --git a/static/saclay/images/plus.png b/saclay_static/saclay/images/plus.png
index ce14109..ce14109 100644
--- a/static/saclay/images/plus.png
+++ b/saclay_static/saclay/images/plus.png
diff --git a/static/saclay/images/plus_alt.png b/saclay_static/saclay/images/plus_alt.png
index 76ffc81..76ffc81 100644
--- a/static/saclay/images/plus_alt.png
+++ b/saclay_static/saclay/images/plus_alt.png
diff --git a/static/saclay/images/plus_on.png b/saclay_static/saclay/images/plus_on.png
index ac7faa2..ac7faa2 100644
--- a/static/saclay/images/plus_on.png
+++ b/saclay_static/saclay/images/plus_on.png
diff --git a/static/saclay/images/popup/close.png b/saclay_static/saclay/images/popup/close.png
index fb4d7dd..fb4d7dd 100644
--- a/static/saclay/images/popup/close.png
+++ b/saclay_static/saclay/images/popup/close.png
diff --git a/static/saclay/images/popup/multimedia_title.png b/saclay_static/saclay/images/popup/multimedia_title.png
index 68d8f30..68d8f30 100644
--- a/static/saclay/images/popup/multimedia_title.png
+++ b/saclay_static/saclay/images/popup/multimedia_title.png
diff --git a/static/saclay/images/popup/thanks_title.png b/saclay_static/saclay/images/popup/thanks_title.png
index 40bfba5..40bfba5 100644
--- a/static/saclay/images/popup/thanks_title.png
+++ b/saclay_static/saclay/images/popup/thanks_title.png
diff --git a/static/saclay/images/popup/title_frame.png b/saclay_static/saclay/images/popup/title_frame.png
index 9e63a89..9e63a89 100644
--- a/static/saclay/images/popup/title_frame.png
+++ b/saclay_static/saclay/images/popup/title_frame.png
diff --git a/static/saclay/images/popup/welcome_close.png b/saclay_static/saclay/images/popup/welcome_close.png
index 42b335b..42b335b 100644
--- a/static/saclay/images/popup/welcome_close.png
+++ b/saclay_static/saclay/images/popup/welcome_close.png
diff --git a/static/saclay/images/popup/welcome_header.png b/saclay_static/saclay/images/popup/welcome_header.png
index 9b6ca77..9b6ca77 100644
--- a/static/saclay/images/popup/welcome_header.png
+++ b/saclay_static/saclay/images/popup/welcome_header.png
diff --git a/static/saclay/images/printer.png b/saclay_static/saclay/images/printer.png
index 0755b38..0755b38 100644
--- a/static/saclay/images/printer.png
+++ b/saclay_static/saclay/images/printer.png
diff --git a/static/saclay/images/routing_end.png b/saclay_static/saclay/images/routing_end.png
index aab3421..aab3421 100644
--- a/static/saclay/images/routing_end.png
+++ b/saclay_static/saclay/images/routing_end.png
diff --git a/static/saclay/images/routing_start.png b/saclay_static/saclay/images/routing_start.png
index 644e0de..644e0de 100644
--- a/static/saclay/images/routing_start.png
+++ b/saclay_static/saclay/images/routing_start.png
diff --git a/static/saclay/images/routing_step.png b/saclay_static/saclay/images/routing_step.png
index 90589a8..90589a8 100644
--- a/static/saclay/images/routing_step.png
+++ b/saclay_static/saclay/images/routing_step.png
diff --git a/static/saclay/images/routing_warn.png b/saclay_static/saclay/images/routing_warn.png
index 70f4e40..70f4e40 100644
--- a/static/saclay/images/routing_warn.png
+++ b/saclay_static/saclay/images/routing_warn.png
diff --git a/static/saclay/images/search.png b/saclay_static/saclay/images/search.png
index 0eff19b..0eff19b 100644
--- a/static/saclay/images/search.png
+++ b/saclay_static/saclay/images/search.png
diff --git a/static/saclay/images/shadow.png b/saclay_static/saclay/images/shadow.png
index e259c8f..e259c8f 100644
--- a/static/saclay/images/shadow.png
+++ b/saclay_static/saclay/images/shadow.png
diff --git a/static/saclay/images/subcategories/agri_1_off.png b/saclay_static/saclay/images/subcategories/agri_1_off.png
index d831042..d831042 100644
--- a/static/saclay/images/subcategories/agri_1_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_1_off.png
diff --git a/static/saclay/images/subcategories/agri_1_on.png b/saclay_static/saclay/images/subcategories/agri_1_on.png
index 354d96d..354d96d 100644
--- a/static/saclay/images/subcategories/agri_1_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_1_on.png
diff --git a/static/saclay/images/subcategories/agri_2_off.png b/saclay_static/saclay/images/subcategories/agri_2_off.png
index 5296004..5296004 100644
--- a/static/saclay/images/subcategories/agri_2_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_2_off.png
diff --git a/static/saclay/images/subcategories/agri_2_on.png b/saclay_static/saclay/images/subcategories/agri_2_on.png
index ab70e7a..ab70e7a 100644
--- a/static/saclay/images/subcategories/agri_2_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_2_on.png
diff --git a/static/saclay/images/subcategories/agri_3_off.png b/saclay_static/saclay/images/subcategories/agri_3_off.png
index 939c7cb..939c7cb 100644
--- a/static/saclay/images/subcategories/agri_3_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_3_off.png
diff --git a/static/saclay/images/subcategories/agri_3_on.png b/saclay_static/saclay/images/subcategories/agri_3_on.png
index 6ed6434..6ed6434 100644
--- a/static/saclay/images/subcategories/agri_3_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_3_on.png
diff --git a/static/saclay/images/subcategories/agri_4_off.png b/saclay_static/saclay/images/subcategories/agri_4_off.png
index 87858ca..87858ca 100644
--- a/static/saclay/images/subcategories/agri_4_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_4_off.png
diff --git a/static/saclay/images/subcategories/agri_4_on.png b/saclay_static/saclay/images/subcategories/agri_4_on.png
index da2efc6..da2efc6 100644
--- a/static/saclay/images/subcategories/agri_4_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_4_on.png
diff --git a/static/saclay/images/subcategories/agri_5_off.png b/saclay_static/saclay/images/subcategories/agri_5_off.png
index 606276a..606276a 100644
--- a/static/saclay/images/subcategories/agri_5_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_5_off.png
diff --git a/static/saclay/images/subcategories/agri_5_on.png b/saclay_static/saclay/images/subcategories/agri_5_on.png
index a818a29..a818a29 100644
--- a/static/saclay/images/subcategories/agri_5_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_5_on.png
diff --git a/static/saclay/images/subcategories/agri_6_off.png b/saclay_static/saclay/images/subcategories/agri_6_off.png
index bc27c2a..bc27c2a 100644
--- a/static/saclay/images/subcategories/agri_6_off.png
+++ b/saclay_static/saclay/images/subcategories/agri_6_off.png
diff --git a/static/saclay/images/subcategories/agri_6_on.png b/saclay_static/saclay/images/subcategories/agri_6_on.png
index 89bb49e..89bb49e 100644
--- a/static/saclay/images/subcategories/agri_6_on.png
+++ b/saclay_static/saclay/images/subcategories/agri_6_on.png
diff --git a/static/saclay/images/subcategories/bala_1_off.png b/saclay_static/saclay/images/subcategories/bala_1_off.png
index d8cb219..d8cb219 100644
--- a/static/saclay/images/subcategories/bala_1_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_1_off.png
diff --git a/static/saclay/images/subcategories/bala_1_on.png b/saclay_static/saclay/images/subcategories/bala_1_on.png
index 484cccd..484cccd 100644
--- a/static/saclay/images/subcategories/bala_1_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_1_on.png
diff --git a/static/saclay/images/subcategories/bala_2_off.png b/saclay_static/saclay/images/subcategories/bala_2_off.png
index 1b31a7b..1b31a7b 100644
--- a/static/saclay/images/subcategories/bala_2_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_2_off.png
diff --git a/static/saclay/images/subcategories/bala_2_on.png b/saclay_static/saclay/images/subcategories/bala_2_on.png
index e221f33..e221f33 100644
--- a/static/saclay/images/subcategories/bala_2_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_2_on.png
diff --git a/static/saclay/images/subcategories/bala_3_off.png b/saclay_static/saclay/images/subcategories/bala_3_off.png
index 1b9d838..1b9d838 100644
--- a/static/saclay/images/subcategories/bala_3_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_3_off.png
diff --git a/static/saclay/images/subcategories/bala_3_on.png b/saclay_static/saclay/images/subcategories/bala_3_on.png
index 1a74193..1a74193 100644
--- a/static/saclay/images/subcategories/bala_3_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_3_on.png
diff --git a/static/saclay/images/subcategories/bala_4_off.png b/saclay_static/saclay/images/subcategories/bala_4_off.png
index 22f3425..22f3425 100644
--- a/static/saclay/images/subcategories/bala_4_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_4_off.png
diff --git a/static/saclay/images/subcategories/bala_4_on.png b/saclay_static/saclay/images/subcategories/bala_4_on.png
index 25daa63..25daa63 100644
--- a/static/saclay/images/subcategories/bala_4_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_4_on.png
diff --git a/static/saclay/images/subcategories/bala_5_off.png b/saclay_static/saclay/images/subcategories/bala_5_off.png
index 2a79d50..2a79d50 100644
--- a/static/saclay/images/subcategories/bala_5_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_5_off.png
diff --git a/static/saclay/images/subcategories/bala_5_on.png b/saclay_static/saclay/images/subcategories/bala_5_on.png
index f9ce605..f9ce605 100644
--- a/static/saclay/images/subcategories/bala_5_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_5_on.png
diff --git a/static/saclay/images/subcategories/bala_6_off.png b/saclay_static/saclay/images/subcategories/bala_6_off.png
index 494f794..494f794 100644
--- a/static/saclay/images/subcategories/bala_6_off.png
+++ b/saclay_static/saclay/images/subcategories/bala_6_off.png
diff --git a/static/saclay/images/subcategories/bala_6_on.png b/saclay_static/saclay/images/subcategories/bala_6_on.png
index 7221918..7221918 100644
--- a/static/saclay/images/subcategories/bala_6_on.png
+++ b/saclay_static/saclay/images/subcategories/bala_6_on.png
diff --git a/static/saclay/images/subcategories/cult_1_off.png b/saclay_static/saclay/images/subcategories/cult_1_off.png
index 6d902f6..6d902f6 100644
--- a/static/saclay/images/subcategories/cult_1_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_1_off.png
diff --git a/static/saclay/images/subcategories/cult_1_on.png b/saclay_static/saclay/images/subcategories/cult_1_on.png
index 48a2029..48a2029 100644
--- a/static/saclay/images/subcategories/cult_1_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_1_on.png
diff --git a/static/saclay/images/subcategories/cult_2_off.png b/saclay_static/saclay/images/subcategories/cult_2_off.png
index 581f6ae..581f6ae 100644
--- a/static/saclay/images/subcategories/cult_2_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_2_off.png
diff --git a/static/saclay/images/subcategories/cult_2_on.png b/saclay_static/saclay/images/subcategories/cult_2_on.png
index b74f7fb..b74f7fb 100644
--- a/static/saclay/images/subcategories/cult_2_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_2_on.png
diff --git a/static/saclay/images/subcategories/cult_3_off.png b/saclay_static/saclay/images/subcategories/cult_3_off.png
index 22dfe34..22dfe34 100644
--- a/static/saclay/images/subcategories/cult_3_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_3_off.png
diff --git a/static/saclay/images/subcategories/cult_3_on.png b/saclay_static/saclay/images/subcategories/cult_3_on.png
index 9c27ddc..9c27ddc 100644
--- a/static/saclay/images/subcategories/cult_3_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_3_on.png
diff --git a/static/saclay/images/subcategories/cult_4_off.png b/saclay_static/saclay/images/subcategories/cult_4_off.png
index 3487ee8..3487ee8 100644
--- a/static/saclay/images/subcategories/cult_4_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_4_off.png
diff --git a/static/saclay/images/subcategories/cult_4_on.png b/saclay_static/saclay/images/subcategories/cult_4_on.png
index 6c79154..6c79154 100644
--- a/static/saclay/images/subcategories/cult_4_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_4_on.png
diff --git a/static/saclay/images/subcategories/cult_5_off.png b/saclay_static/saclay/images/subcategories/cult_5_off.png
index a07a5d3..a07a5d3 100644
--- a/static/saclay/images/subcategories/cult_5_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_5_off.png
diff --git a/static/saclay/images/subcategories/cult_5_on.png b/saclay_static/saclay/images/subcategories/cult_5_on.png
index 47d9840..47d9840 100644
--- a/static/saclay/images/subcategories/cult_5_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_5_on.png
diff --git a/static/saclay/images/subcategories/cult_6_off.png b/saclay_static/saclay/images/subcategories/cult_6_off.png
index 3087db5..3087db5 100644
--- a/static/saclay/images/subcategories/cult_6_off.png
+++ b/saclay_static/saclay/images/subcategories/cult_6_off.png
diff --git a/static/saclay/images/subcategories/cult_6_on.png b/saclay_static/saclay/images/subcategories/cult_6_on.png
index f211914..f211914 100644
--- a/static/saclay/images/subcategories/cult_6_on.png
+++ b/saclay_static/saclay/images/subcategories/cult_6_on.png
diff --git a/static/saclay/images/subcategories/even_1_off.png b/saclay_static/saclay/images/subcategories/even_1_off.png
index 477d534..477d534 100644
--- a/static/saclay/images/subcategories/even_1_off.png
+++ b/saclay_static/saclay/images/subcategories/even_1_off.png
diff --git a/static/saclay/images/subcategories/even_1_on.png b/saclay_static/saclay/images/subcategories/even_1_on.png
index 3fff957..3fff957 100644
--- a/static/saclay/images/subcategories/even_1_on.png
+++ b/saclay_static/saclay/images/subcategories/even_1_on.png
diff --git a/static/saclay/images/subcategories/even_2_off.png b/saclay_static/saclay/images/subcategories/even_2_off.png
index ec7af5d..ec7af5d 100644
--- a/static/saclay/images/subcategories/even_2_off.png
+++ b/saclay_static/saclay/images/subcategories/even_2_off.png
diff --git a/static/saclay/images/subcategories/even_2_on.png b/saclay_static/saclay/images/subcategories/even_2_on.png
index a8ba473..a8ba473 100644
--- a/static/saclay/images/subcategories/even_2_on.png
+++ b/saclay_static/saclay/images/subcategories/even_2_on.png
diff --git a/static/saclay/images/subcategories/even_3_off.png b/saclay_static/saclay/images/subcategories/even_3_off.png
index 2682910..2682910 100644
--- a/static/saclay/images/subcategories/even_3_off.png
+++ b/saclay_static/saclay/images/subcategories/even_3_off.png
diff --git a/static/saclay/images/subcategories/even_3_on.png b/saclay_static/saclay/images/subcategories/even_3_on.png
index 4a628d6..4a628d6 100644
--- a/static/saclay/images/subcategories/even_3_on.png
+++ b/saclay_static/saclay/images/subcategories/even_3_on.png
diff --git a/static/saclay/images/subcategories/even_4_off.png b/saclay_static/saclay/images/subcategories/even_4_off.png
index bd26719..bd26719 100644
--- a/static/saclay/images/subcategories/even_4_off.png
+++ b/saclay_static/saclay/images/subcategories/even_4_off.png
diff --git a/static/saclay/images/subcategories/even_4_on.png b/saclay_static/saclay/images/subcategories/even_4_on.png
index a426170..a426170 100644
--- a/static/saclay/images/subcategories/even_4_on.png
+++ b/saclay_static/saclay/images/subcategories/even_4_on.png
diff --git a/static/saclay/images/subcategories/even_5_off.png b/saclay_static/saclay/images/subcategories/even_5_off.png
index 3120d1e..3120d1e 100644
--- a/static/saclay/images/subcategories/even_5_off.png
+++ b/saclay_static/saclay/images/subcategories/even_5_off.png
diff --git a/static/saclay/images/subcategories/even_5_on.png b/saclay_static/saclay/images/subcategories/even_5_on.png
index 8f204dc..8f204dc 100644
--- a/static/saclay/images/subcategories/even_5_on.png
+++ b/saclay_static/saclay/images/subcategories/even_5_on.png
diff --git a/static/saclay/images/subcategories/even_6_off.png b/saclay_static/saclay/images/subcategories/even_6_off.png
index 990aecb..990aecb 100644
--- a/static/saclay/images/subcategories/even_6_off.png
+++ b/saclay_static/saclay/images/subcategories/even_6_off.png
diff --git a/static/saclay/images/subcategories/even_6_on.png b/saclay_static/saclay/images/subcategories/even_6_on.png
index f6bb3c7..f6bb3c7 100644
--- a/static/saclay/images/subcategories/even_6_on.png
+++ b/saclay_static/saclay/images/subcategories/even_6_on.png
diff --git a/static/saclay/images/subcategories/even_7_off.png b/saclay_static/saclay/images/subcategories/even_7_off.png
index 4418f82..4418f82 100644
--- a/static/saclay/images/subcategories/even_7_off.png
+++ b/saclay_static/saclay/images/subcategories/even_7_off.png
diff --git a/static/saclay/images/subcategories/even_7_on.png b/saclay_static/saclay/images/subcategories/even_7_on.png
index 043f158..043f158 100644
--- a/static/saclay/images/subcategories/even_7_on.png
+++ b/saclay_static/saclay/images/subcategories/even_7_on.png
diff --git a/static/saclay/images/subcategories/even_8_off.png b/saclay_static/saclay/images/subcategories/even_8_off.png
index 04ecc81..04ecc81 100644
--- a/static/saclay/images/subcategories/even_8_off.png
+++ b/saclay_static/saclay/images/subcategories/even_8_off.png
diff --git a/static/saclay/images/subcategories/even_8_on.png b/saclay_static/saclay/images/subcategories/even_8_on.png
index bd76803..bd76803 100644
--- a/static/saclay/images/subcategories/even_8_on.png
+++ b/saclay_static/saclay/images/subcategories/even_8_on.png
diff --git a/static/saclay/images/subcategories/mob_1_off.png b/saclay_static/saclay/images/subcategories/mob_1_off.png
index 90115a9..90115a9 100644
--- a/static/saclay/images/subcategories/mob_1_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_1_off.png
diff --git a/static/saclay/images/subcategories/mob_1_on.png b/saclay_static/saclay/images/subcategories/mob_1_on.png
index 4beb571..4beb571 100644
--- a/static/saclay/images/subcategories/mob_1_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_1_on.png
diff --git a/static/saclay/images/subcategories/mob_2_off.png b/saclay_static/saclay/images/subcategories/mob_2_off.png
index 1dfa8b8..1dfa8b8 100644
--- a/static/saclay/images/subcategories/mob_2_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_2_off.png
diff --git a/static/saclay/images/subcategories/mob_2_on.png b/saclay_static/saclay/images/subcategories/mob_2_on.png
index 54aa2fc..54aa2fc 100644
--- a/static/saclay/images/subcategories/mob_2_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_2_on.png
diff --git a/static/saclay/images/subcategories/mob_3_disabled.png b/saclay_static/saclay/images/subcategories/mob_3_disabled.png
index b2ec02c..b2ec02c 100644
--- a/static/saclay/images/subcategories/mob_3_disabled.png
+++ b/saclay_static/saclay/images/subcategories/mob_3_disabled.png
diff --git a/static/saclay/images/subcategories/mob_3_off.png b/saclay_static/saclay/images/subcategories/mob_3_off.png
index 3d4db66..3d4db66 100644
--- a/static/saclay/images/subcategories/mob_3_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_3_off.png
diff --git a/static/saclay/images/subcategories/mob_3_on.png b/saclay_static/saclay/images/subcategories/mob_3_on.png
index 2db8bca..2db8bca 100644
--- a/static/saclay/images/subcategories/mob_3_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_3_on.png
diff --git a/static/saclay/images/subcategories/mob_4_off.png b/saclay_static/saclay/images/subcategories/mob_4_off.png
index f7e6402..f7e6402 100644
--- a/static/saclay/images/subcategories/mob_4_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_4_off.png
diff --git a/static/saclay/images/subcategories/mob_4_on.png b/saclay_static/saclay/images/subcategories/mob_4_on.png
index b67a35f..b67a35f 100644
--- a/static/saclay/images/subcategories/mob_4_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_4_on.png
diff --git a/static/saclay/images/subcategories/mob_5_off.png b/saclay_static/saclay/images/subcategories/mob_5_off.png
index cbe1074..cbe1074 100644
--- a/static/saclay/images/subcategories/mob_5_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_5_off.png
diff --git a/static/saclay/images/subcategories/mob_5_on.png b/saclay_static/saclay/images/subcategories/mob_5_on.png
index 46d815b..46d815b 100644
--- a/static/saclay/images/subcategories/mob_5_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_5_on.png
diff --git a/static/saclay/images/subcategories/mob_6_off.png b/saclay_static/saclay/images/subcategories/mob_6_off.png
index c23a438..c23a438 100644
--- a/static/saclay/images/subcategories/mob_6_off.png
+++ b/saclay_static/saclay/images/subcategories/mob_6_off.png
diff --git a/static/saclay/images/subcategories/mob_6_on.png b/saclay_static/saclay/images/subcategories/mob_6_on.png
index 5b6832f..5b6832f 100644
--- a/static/saclay/images/subcategories/mob_6_on.png
+++ b/saclay_static/saclay/images/subcategories/mob_6_on.png
diff --git a/static/saclay/images/subcategories/patri_1_off.png b/saclay_static/saclay/images/subcategories/patri_1_off.png
index dfc23e4..dfc23e4 100644
--- a/static/saclay/images/subcategories/patri_1_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_1_off.png
diff --git a/static/saclay/images/subcategories/patri_1_on.png b/saclay_static/saclay/images/subcategories/patri_1_on.png
index 6f98059..6f98059 100644
--- a/static/saclay/images/subcategories/patri_1_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_1_on.png
diff --git a/static/saclay/images/subcategories/patri_2_off.png b/saclay_static/saclay/images/subcategories/patri_2_off.png
index c4f5716..c4f5716 100644
--- a/static/saclay/images/subcategories/patri_2_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_2_off.png
diff --git a/static/saclay/images/subcategories/patri_2_on.png b/saclay_static/saclay/images/subcategories/patri_2_on.png
index a07ba54..a07ba54 100644
--- a/static/saclay/images/subcategories/patri_2_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_2_on.png
diff --git a/static/saclay/images/subcategories/patri_3_off.png b/saclay_static/saclay/images/subcategories/patri_3_off.png
index f65f6d7..f65f6d7 100644
--- a/static/saclay/images/subcategories/patri_3_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_3_off.png
diff --git a/static/saclay/images/subcategories/patri_3_on.png b/saclay_static/saclay/images/subcategories/patri_3_on.png
index effcc16..effcc16 100644
--- a/static/saclay/images/subcategories/patri_3_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_3_on.png
diff --git a/static/saclay/images/subcategories/patri_4_off.png b/saclay_static/saclay/images/subcategories/patri_4_off.png
index 7630f15..7630f15 100644
--- a/static/saclay/images/subcategories/patri_4_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_4_off.png
diff --git a/static/saclay/images/subcategories/patri_4_on.png b/saclay_static/saclay/images/subcategories/patri_4_on.png
index feb1fc5..feb1fc5 100644
--- a/static/saclay/images/subcategories/patri_4_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_4_on.png
diff --git a/static/saclay/images/subcategories/patri_5_off.png b/saclay_static/saclay/images/subcategories/patri_5_off.png
index 3243f70..3243f70 100644
--- a/static/saclay/images/subcategories/patri_5_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_5_off.png
diff --git a/static/saclay/images/subcategories/patri_5_on.png b/saclay_static/saclay/images/subcategories/patri_5_on.png
index 01b5342..01b5342 100644
--- a/static/saclay/images/subcategories/patri_5_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_5_on.png
diff --git a/static/saclay/images/subcategories/patri_6_off.png b/saclay_static/saclay/images/subcategories/patri_6_off.png
index 8dda7ab..8dda7ab 100644
--- a/static/saclay/images/subcategories/patri_6_off.png
+++ b/saclay_static/saclay/images/subcategories/patri_6_off.png
diff --git a/static/saclay/images/subcategories/patri_6_on.png b/saclay_static/saclay/images/subcategories/patri_6_on.png
index 6d5b8ad..6d5b8ad 100644
--- a/static/saclay/images/subcategories/patri_6_on.png
+++ b/saclay_static/saclay/images/subcategories/patri_6_on.png
diff --git a/static/saclay/images/subcategories/ress_1_off.png b/saclay_static/saclay/images/subcategories/ress_1_off.png
index 1e4b193..1e4b193 100644
--- a/static/saclay/images/subcategories/ress_1_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_1_off.png
diff --git a/static/saclay/images/subcategories/ress_1_on.png b/saclay_static/saclay/images/subcategories/ress_1_on.png
index 0d8b928..0d8b928 100644
--- a/static/saclay/images/subcategories/ress_1_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_1_on.png
diff --git a/static/saclay/images/subcategories/ress_2_off.png b/saclay_static/saclay/images/subcategories/ress_2_off.png
index 27410d7..27410d7 100644
--- a/static/saclay/images/subcategories/ress_2_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_2_off.png
diff --git a/static/saclay/images/subcategories/ress_2_on.png b/saclay_static/saclay/images/subcategories/ress_2_on.png
index 6ba1068..6ba1068 100644
--- a/static/saclay/images/subcategories/ress_2_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_2_on.png
diff --git a/static/saclay/images/subcategories/ress_3_off.png b/saclay_static/saclay/images/subcategories/ress_3_off.png
index 7e17b76..7e17b76 100644
--- a/static/saclay/images/subcategories/ress_3_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_3_off.png
diff --git a/static/saclay/images/subcategories/ress_3_on.png b/saclay_static/saclay/images/subcategories/ress_3_on.png
index f56cc0f..f56cc0f 100644
--- a/static/saclay/images/subcategories/ress_3_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_3_on.png
diff --git a/static/saclay/images/subcategories/ress_4_off.png b/saclay_static/saclay/images/subcategories/ress_4_off.png
index 0cdc84c..0cdc84c 100644
--- a/static/saclay/images/subcategories/ress_4_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_4_off.png
diff --git a/static/saclay/images/subcategories/ress_4_on.png b/saclay_static/saclay/images/subcategories/ress_4_on.png
index 83f3145..83f3145 100644
--- a/static/saclay/images/subcategories/ress_4_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_4_on.png
diff --git a/static/saclay/images/subcategories/ress_5_off.png b/saclay_static/saclay/images/subcategories/ress_5_off.png
index 3ecd3b5..3ecd3b5 100644
--- a/static/saclay/images/subcategories/ress_5_off.png
+++ b/saclay_static/saclay/images/subcategories/ress_5_off.png
diff --git a/static/saclay/images/subcategories/ress_5_on.png b/saclay_static/saclay/images/subcategories/ress_5_on.png
index a5735e7..a5735e7 100644
--- a/static/saclay/images/subcategories/ress_5_on.png
+++ b/saclay_static/saclay/images/subcategories/ress_5_on.png
diff --git a/static/saclay/images/subcategories/spor_1_off.png b/saclay_static/saclay/images/subcategories/spor_1_off.png
index 2340224..2340224 100644
--- a/static/saclay/images/subcategories/spor_1_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_1_off.png
diff --git a/static/saclay/images/subcategories/spor_1_on.png b/saclay_static/saclay/images/subcategories/spor_1_on.png
index 4bcd447..4bcd447 100644
--- a/static/saclay/images/subcategories/spor_1_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_1_on.png
diff --git a/static/saclay/images/subcategories/spor_2_off.png b/saclay_static/saclay/images/subcategories/spor_2_off.png
index a5c3ef7..a5c3ef7 100644
--- a/static/saclay/images/subcategories/spor_2_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_2_off.png
diff --git a/static/saclay/images/subcategories/spor_2_on.png b/saclay_static/saclay/images/subcategories/spor_2_on.png
index c124233..c124233 100644
--- a/static/saclay/images/subcategories/spor_2_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_2_on.png
diff --git a/static/saclay/images/subcategories/spor_3_off.png b/saclay_static/saclay/images/subcategories/spor_3_off.png
index 2c09500..2c09500 100644
--- a/static/saclay/images/subcategories/spor_3_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_3_off.png
diff --git a/static/saclay/images/subcategories/spor_3_on.png b/saclay_static/saclay/images/subcategories/spor_3_on.png
index 855333f..855333f 100644
--- a/static/saclay/images/subcategories/spor_3_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_3_on.png
diff --git a/static/saclay/images/subcategories/spor_4_off.png b/saclay_static/saclay/images/subcategories/spor_4_off.png
index ef00d57..ef00d57 100644
--- a/static/saclay/images/subcategories/spor_4_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_4_off.png
diff --git a/static/saclay/images/subcategories/spor_4_on.png b/saclay_static/saclay/images/subcategories/spor_4_on.png
index 1054558..1054558 100644
--- a/static/saclay/images/subcategories/spor_4_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_4_on.png
diff --git a/static/saclay/images/subcategories/spor_5_off.png b/saclay_static/saclay/images/subcategories/spor_5_off.png
index e99b52f..e99b52f 100644
--- a/static/saclay/images/subcategories/spor_5_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_5_off.png
diff --git a/static/saclay/images/subcategories/spor_5_on.png b/saclay_static/saclay/images/subcategories/spor_5_on.png
index db3937a..db3937a 100644
--- a/static/saclay/images/subcategories/spor_5_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_5_on.png
diff --git a/static/saclay/images/subcategories/spor_6_off.png b/saclay_static/saclay/images/subcategories/spor_6_off.png
index 6471dda..6471dda 100644
--- a/static/saclay/images/subcategories/spor_6_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_6_off.png
diff --git a/static/saclay/images/subcategories/spor_6_on.png b/saclay_static/saclay/images/subcategories/spor_6_on.png
index 57e2348..57e2348 100644
--- a/static/saclay/images/subcategories/spor_6_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_6_on.png
diff --git a/static/saclay/images/subcategories/spor_7_off.png b/saclay_static/saclay/images/subcategories/spor_7_off.png
index a5fe1d2..a5fe1d2 100644
--- a/static/saclay/images/subcategories/spor_7_off.png
+++ b/saclay_static/saclay/images/subcategories/spor_7_off.png
diff --git a/static/saclay/images/subcategories/spor_7_on.png b/saclay_static/saclay/images/subcategories/spor_7_on.png
index 793f328..793f328 100644
--- a/static/saclay/images/subcategories/spor_7_on.png
+++ b/saclay_static/saclay/images/subcategories/spor_7_on.png
diff --git a/static/saclay/js/interface.js b/saclay_static/saclay/js/interface.js
index ba14b15..25a23f6 100644
--- a/static/saclay/js/interface.js
+++ b/saclay_static/saclay/js/interface.js
@@ -1,4 +1,3 @@
-
 var init_default_message_diag = function(){
     $('#default-message').dialog({
           'autoOpen':false,
@@ -12,6 +11,7 @@ var init_default_message_diag = function(){
 
 $(function(){
     init_default_message_diag();
+    $("#categories").fadeIn();
     var update_editmarker = function(){
         $("#main-map").chimere('cleanRoute');
         $('.map_button').hide();
@@ -183,8 +183,8 @@ function change_routing_transport(){
                            $('input[name="transport"]:checked').val());
 }
 
-function display_feature_detail(data, settings){
-    settings.current_popup.setContentHTML("<div class='cloud'>" + data + "</div>");
+function display_feature_detail_callback(settings){
+    $('.popover-title').hide();
     $('.detail_zoomin').bind("click", function(event){
         $('#main-map').chimere('hidePopup', event);
         $('#main-map').chimere('zoomIn');
@@ -208,6 +208,7 @@ function display_feature_detail(data, settings){
     jQuery(".close_img").click(function(event){
         $("#main-map").chimere('hidePopup', event);
     });
+    /*
     jQuery("#read_more_"+settings.current_feature.pk).click(function(){
         $('#detail_content').css('height', $('#detail_content').height());
         $("#description_short_"+settings.current_feature.pk).hide();
@@ -221,6 +222,7 @@ function display_feature_detail(data, settings){
         $("#read_less_"+settings.current_feature.pk).hide();
         $("#read_more_"+settings.current_feature.pk).show();
     });
+    */
     $(document).ready(function(){
         share_link_update();
         $("a[rel^='prettyPhoto']").prettyPhoto({
@@ -230,11 +232,7 @@ function display_feature_detail(data, settings){
     });
     $('html').addClass('js-on');
     $(function(){
-        $('div.media-player').jmeEmbedControls();
-        setTimeout(function(){
-            settings.current_popup.updateSize();
-            setTimeout(function(){ settings.current_popup.updateSize(); }, 1000);
-        }, 1000);
+        // $('div.media-player').jmeEmbedControls();
     });
 }
 
diff --git a/static/saclay/js/jquery.form.js b/saclay_static/saclay/js/jquery.form.js
index 13e9a55..13e9a55 100644
--- a/static/saclay/js/jquery.form.js
+++ b/saclay_static/saclay/js/jquery.form.js
diff --git a/static/saclay/js/mobile.chimere.js b/saclay_static/saclay/js/mobile.chimere.js
index e05cd22..e05cd22 100644
--- a/static/saclay/js/mobile.chimere.js
+++ b/saclay_static/saclay/js/mobile.chimere.js
diff --git a/settings.py b/settings.py
index 0a9ba06..708443a 100644
--- a/settings.py
+++ b/settings.py
@@ -11,10 +11,12 @@ _ = lambda s: s
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 MOBILE_TEST = False
-DJANGO_EXTENSIONS = False
+DEBUG_TOOLBAR = False
+SQL_DEBUG = False
+
 
 # Django settings for chimere project.
-PROJECT_NAME = u'Chimère'
+PROJECT_NAME = 'Chimere'
 ROOT_PATH = os.path.realpath(os.path.dirname(__file__)) + "/"
 
 EMAIL_HOST = 'localhost'
@@ -22,15 +24,18 @@ CONTACT_EMAIL = ''
 STATIC_URL = '/static/'
 STATIC_ROOT = ROOT_PATH + 'static/'
 
-TINYMCE_URL = '/tinymce/'
-EXTRA_CSS = []
-JQUERY_JS_URLS = []
-JQUERY_CSS_URLS = []
+STATICFILES_DIRS = (
+    os.path.join(ROOT_PATH, "saclay_static"),
+)
 
-OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"]
+TINYMCE_URL = ''
+JQUERY_JS_URLS = ('/javascript/jquery/jquery.js',
+                  '/javascript/jquery-ui/jquery-ui.js',)
+JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css',
+                   '/javascript/jquery-ui/themes/base/jquery.ui.all.css')
 
 GPSBABEL = '/usr/bin/gpsbabel'
-# simplify with an error of 5 meters
+# simplify with an error of 5 meters
 GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k'
 # GPSBABEL_OPTIONS = 'simplify,count=100'
 
@@ -61,10 +66,8 @@ CHIMERE_FEEDS = True
 # display a directory of items
 CHIMERE_DIRECTORY = False
 
-CHIMERE_ICON_WIDTH = 36
-CHIMERE_ICON_HEIGHT = 42
-CHIMERE_ICON_OFFSET_X = -18
-CHIMERE_ICON_OFFSET_Y = -42
+# content inside the popup or on a specific window
+CHIMERE_CONTENT_INSIDE_POPUP = False
 
 # display picture inside the description by default or inside a galery?
 CHIMERE_MINIATURE_BY_DEFAULT = False
@@ -74,7 +77,10 @@ CHIMERE_MINIATURE_BY_DEFAULT = False
 # cf. OpenLayers documentation for more details
 
 # OSM mapnik map
-CHIMERE_DEFAULT_MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')"
+CHIMERE_DEFAULT_MAP_LAYER = """new ol.layer.Tile({
+    style: 'Road',
+    source: new ol.source.OSM()
+})"""
 
 CHIMERE_XAPI_URL = 'http://open.mapquestapi.com/xapi/api/0.6/'
 CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org'  # test URL
@@ -88,16 +94,16 @@ CHIMERE_SHAPEFILE_ENCODING = 'ISO-8859-1'
 # it could be a good idea to hide it to an admin who could'nt do that
 CHIMERE_HIDE_PROPERTYMODEL = False
 
+# clustering of markers
 CHIMERE_ENABLE_CLUSTERING = False
 
-# enable routing in Chimère
+# enable routing in Chimere
 CHIMERE_ENABLE_ROUTING = False
 
-CHIMERE_ROUTING_TRANSPORT = (
-    ('foot', _(u"Foot")),
-    ('bicycle', _(u"Bicycle")),
-    ('motorcar', _(u"Motorcar")),
-)
+CHIMERE_ROUTING_TRANSPORT = (('foot', _(u"Foot")),
+                             ('bicycle', _(u"Bicycle")),
+                             ('motorcar', _(u"Motorcar")),
+                             )
 
 CHIMERE_ROUTING_SPEEDS = {
     'foot': ((3, _(u"You are walking slowly")),
@@ -114,12 +120,24 @@ CHIMERE_ROUTING_ENGINE = {
 }
 
 CHIMERE_ROUTING_FAIL_MESSAGE = u"""<h3 class='warn'>Attention</h3>
-<p>Le moteur de routage a échoué dans sa recherche de trajet. Les points de
-départ ou d'arrivée sont peut-être trop loin d'une voie existante ou le trajet
+<p>Le moteur de routage a echoue dans sa recherche de trajet. Les points de
+depart ou d'arrivee sont peut-etre trop loin d'une voie existante ou le trajet
 est trop dangereux.</p>"""
 
 NOMINATIM_URL = 'http://nominatim.openstreetmap.org/search'
 
+# Fields used to geolocate with nominatim
+# (http://wiki.openstreetmap.org/wiki/Nominatim#Search)
+# from external sources. Key must be a valid parameters for Nominatim. If given
+# value are property slugs use the corresponding value otherwise use it as a
+# fixed value
+# e.g : {'street':'address', 'city':'city', 'country':u'France'}
+
+CHIMERE_NOMINATIM_FIELDS = {'street': 'address', 'city': 'city',
+                            'country': u'France'}
+MOBILE_TEST = False
+MOBILE_DOMAINS = []
+
 # thumbnail
 CHIMERE_THUMBS_SCALE_HEIGHT = 250
 CHIMERE_THUMBS_SCALE_WIDTH = None
@@ -142,13 +160,15 @@ CHIMERE_SHORT_DESC_LENGTH = 400
 CHIMERE_MODIF_EMAIL = _(u"Hello, I would like to propose you a modification "
                         u"about this item: ")
 
-CHIMERE_ROUTING_WARN_MESSAGE = u"<h3 class='warn'>Attention</h3>"\
-    u"<p>Cet itinéraire comporte des passages dangereux, nous vous conseillons"\
-    u" de modifier votre recherche, en ajoutant par exemple un ou des points "\
-    u"d'étape à votre parcours pour éviter les zones de danger.</p>"
+CHIMERE_ROUTING_WARN_MESSAGE = "<h3 class='warn'>Attention</h3>"\
+    "<p>Cet itinéraire comporte des passages dangereux, nous vous conseillons"\
+    " de modifier votre recherche, en ajoutant par exemple un ou des points "\
+    "d'étape à votre parcours pour éviter les zones de danger.</p>"
 
 CHIMERE_CSV_ENCODING = 'ISO-8859-1'
 
+CHIMERE_DEFAULT_ACTIONS = ['view', 'contribute']
+CHIMERE_DEFAULT_ACTION_LABEL = [u"Cartes", u"Ajouter un element"]
 # generic contact email
 CONTACT_EMAIL = ''
 
@@ -160,20 +180,19 @@ MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
-        'NAME': 'ratatouille',
+        'NAME': 'chimere',
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'HOST': 'localhost',
+        'HOST': 'postgres',
         'PORT': '5432',
-        'USER': 'ratatouille',
-        'PASSWORD': 'wiki',
+        'USER': 'chimere',
+        'PASSWORD': 'chimere',
     },
 }
 
-if 'test' in sys.argv:
-    SOUTH_TESTS_MIGRATE = False
 
 # Local time zone for this installation. Choices can be found here:
-# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
+# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html
+# #DATETIME-TIMEZONE-SET-TABLE
 # although not all variations may be possible on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
@@ -205,13 +224,13 @@ TEMPLATE_LOADERS = (
     'django.template.loaders.app_directories.Loader',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE_CLASSES = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware'
-)
+]
 
 ROOT_URLCONF = 'chimere_saclay.urls'
 
@@ -242,8 +261,6 @@ INSTALLED_APPS = [
 # celery
 try:
     import djcelery
-    import kombu
-    kombu
     djcelery.setup_loader()
     BROKER_URL = 'django://'
     INSTALLED_APPS += ['kombu.transport.django',
@@ -253,85 +270,64 @@ except ImportError:
     pass
 
 INSTALLED_APPS += [
-    'south',
     'chimere',
 ]
 
+LOG_PATH = '/var/log/django/'
 MOBILE_DOMAINS = []  # if you have specific domains for mobile access
 
-LOGFILENAME = '/var/log/django/chimere.log'
-
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        # Include the default Django email handler for errors
-        # This is what you'd get without configuring logging at all.
-        'mail_admins': {
-            'class': 'django.utils.log.AdminEmailHandler',
-            'level': 'ERROR',
-            # But the emails are plain text by default - HTML is nicer
-            'include_html': True,
-        },
-        # Log to a text file that can be rotated by logrotate
-        'logfile': {
-            'class': 'logging.handlers.WatchedFileHandler',
-            'filename': '/var/log/django/chimere.log'
-        },
-    },
-    'loggers': {
-        # Again, default Django configuration to email unhandled exceptions
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-        # Might as well log any errors anywhere else in Django
-        'django': {
-            'handlers': ['logfile'],
-            'level': 'ERROR',
-            'propagate': False,
-        },
-        # Your own app - this assumes all your logger names start with "myapp."
-        'chimere': {
-            'handlers': ['logfile'],
-            'level': 'WARNING',  # Or maybe INFO or DEBUG
-            'propogate': False
-        },
-    },
-}
-
-CHIMERE_SEARCH_ENGINE = False
-# default haystack parameters when search engine is activated
-HAYSTACK_CONNECTIONS = {
-    'default': {
-        'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
-        'URL': 'http://127.0.0.1:8080/solr'
-    },
-}
-HAYSTACK_SEARCH_RESULTS_PER_PAGE = 12
-HAYSTACK_AUTOCOMPLETE = False
 
 try:
     from local_settings import *
-except ImportError, e:
-    print 'Unable to load local_settings.py:', e
+except ImportError as e:
+    print('Unable to load local_settings.py:', e)
 
 if CHIMERE_SEARCH_ENGINE:
-    INSTALLED_APPS.insert(INSTALLED_APPS.index('south'), 'haystack')
-
-if DJANGO_EXTENSIONS:
-    INSTALLED_APPS.append('django_extensions')
-
-if not JQUERY_JS_URLS:
-    JQUERY_JS_URLS = (STATIC_URL + 'jquery/jquery.min.js',
-                      STATIC_URL + 'jquery-ui/jquery-ui.min.js')
-
-if not JQUERY_CSS_URLS:
-    JQUERY_CSS_URLS = (STATIC_URL + 'jquery-ui/smoothness/jquery-ui.css',
-                       STATIC_URL + 'jquery-ui/base/jquery.ui.all.css')
+    INSTALLED_APPS.append('haystack')
+
+if 'LOGGING' not in globals():
+    global LOGGING
+    LOGGING = {
+        'version': 1,
+        'disable_existing_loggers': False,
+        'handlers': {
+            # Include the default Django email handler for errors
+            # This is what you'd get without configuring logging at all.
+            'mail_admins': {
+                'class': 'django.utils.log.AdminEmailHandler',
+                'level': 'ERROR',
+                # But the emails are plain text by default - HTML is nicer
+                'include_html': True,
+            },
+            # Log to a text file that can be rotated by logrotate
+            'logfile': {
+                'class': 'logging.handlers.WatchedFileHandler',
+                'filename': LOG_PATH + 'chimere.log'
+            },
+        },
+        'loggers': {
+            # Again, default Django configuration to email unhandled exceptions
+            'django.request': {
+                'handlers': ['mail_admins'],
+                'level': 'ERROR',
+                'propagate': True,
+            },
+            # Might as well log any errors anywhere else in Django
+            'django': {
+                'handlers': ['logfile'],
+                'level': 'ERROR',
+                'propagate': False,
+            },
+            # Your own app
+            # this assumes all your logger names start with "myapp."
+            'chimere': {
+                'handlers': ['logfile'],
+                'level': 'WARNING',  # Or maybe INFO or DEBUG
+                'propogate': False
+            },
+        },
+    }
 
-LOGGING['handlers']['logfile']['filename'] = LOGFILENAME
 
 if 'CHIMERE_SHARE_NETWORKS' not in globals():
     # after the locals to get the right STATIC_URL
@@ -347,14 +343,49 @@ if 'CHIMERE_SHARE_NETWORKS' not in globals():
          STATIC_URL + 'chimere/img/twitter.png'),
     )
 
-if 'OSM_JS_URLS' not in globals():
-    global OSM_JS_URLS
-    OSM_JS_URLS = [STATIC_URL + "openlayers/OpenLayers.js",
-                   STATIC_URL + "openlayers/SimplePanZoom.js",
-                   "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"]
+if 'MAP_CSS_URLS' not in globals():
+    global MAP_CSS_URLS
+    MAP_CSS_URLS = [STATIC_URL + "ol3/ol.css"]
+
+if 'MAP_JS_URLS' not in globals():
+    global MAP_JS_URLS
+    if DEBUG:
+        MAP_JS_URLS = [STATIC_URL + "ol3/ol-debug.js"]
+    else:
+        MAP_JS_URLS = [STATIC_URL + "ol3/ol.js"]
 if 'OSM_MOBILE_JS_URLS' not in globals():
-    global OSM_MOBILE_JS_URLS
-    OSM_MOBILE_JS_URLS = [
+    global OSM_MOBILE_URLS
+    OSM_JS_MOBILE_URLS = [
         STATIC_URL + "openlayers/OpenLayers.mobile.js",
-        "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"
+        STATIC_URL + "openlayers/SimplePanZoom.js",
+        "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"]
+
+if DEBUG_TOOLBAR:
+    if '..' not in sys.path:
+        sys.path.insert(0, '..')
+    global DEBUG_TOOLBAR_PANELS
+    global DEBUG_TOOLBAR_CONFIG
+    MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware']
+    INSTALLED_APPS += ['debug_toolbar']
+    DEBUG_TOOLBAR_PANELS = [
+        'debug_toolbar.panels.versions.VersionsPanel',
+        'debug_toolbar.panels.timer.TimerPanel',
+        'debug_toolbar.panels.settings.SettingsPanel',
+        'debug_toolbar.panels.headers.HeadersPanel',
+        'debug_toolbar.panels.request.RequestPanel',
+        'debug_toolbar.panels.sql.SQLPanel',
+        'debug_toolbar.panels.staticfiles.StaticFilesPanel',
+        'debug_toolbar.panels.templates.TemplatesPanel',
+        'debug_toolbar.panels.cache.CachePanel',
+        'debug_toolbar.panels.signals.SignalsPanel',
+        'debug_toolbar.panels.logging.LoggingPanel',
+        'debug_toolbar.panels.redirects.RedirectsPanel',
     ]
+    DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS': False}
+
+
+if SQL_DEBUG:
+    LOGGING['loggers']['django.db.backends'] = {
+        'level': 'DEBUG',
+        'handlers': ['console'],
+    }
diff --git a/static/saclay/js/SaclayCloud.js b/static/saclay/js/SaclayCloud.js
deleted file mode 100644
index a3f48f4..0000000
--- a/static/saclay/js/SaclayCloud.js
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/* set this empty if you put cloud-popup-saclay.png inside your default
- * OpenLayers dir */
-var SACLAY_IMAGE_PATH = '../../saclay/images/'
-
-OpenLayers.Popup.SaclayCloud =
-  OpenLayers.Class(OpenLayers.Popup.FramedCloud, {
-
-    initialize:function(id, lonlat, contentSize, contentHTML, anchor, closeBox,
-                        closeBoxCallback) {
-        this.positionBlocks.tc = {
-            'offset': new OpenLayers.Pixel(-217, 28),
-            'padding': new OpenLayers.Bounds(8, 30, 8, 9),
-            'blocks': [
-                { // top-left
-                    size: new OpenLayers.Size('auto', 'auto'),
-                    anchor: new OpenLayers.Bounds(0, 51, 22, 0),
-                    position: new OpenLayers.Pixel(0, 0)
-                },
-                { //top-right
-                    size: new OpenLayers.Size(22, 'auto'),
-                    anchor: new OpenLayers.Bounds(null, 50, 0, 0),
-                    position: new OpenLayers.Pixel(-1238, 0)
-                },
-                { //bottom-left
-                    size: new OpenLayers.Size('auto', 19),
-                    anchor: new OpenLayers.Bounds(0, 32, 22, null),
-                    position: new OpenLayers.Pixel(0, -631)
-                },
-                { //bottom-right
-                    size: new OpenLayers.Size(22, 18),
-                    anchor: new OpenLayers.Bounds(null, 32, 0, null),
-                    position: new OpenLayers.Pixel(-1238, -631)
-                    /*anchor: new OpenLayers.Bounds(null, 32, 10, null),
-                    position: new OpenLayers.Pixel(-1228, -632)*/
-                },
-                { // stem
-                    size: new OpenLayers.Size(54, 35),
-                    anchor: new OpenLayers.Bounds(null, 0, 168, null),
-                    position: new OpenLayers.Pixel(0, -688)
-                }
-            ]
-        };
-
-        this.calculateRelativePosition = function () {return 'tc';};
-        this.autoSize = true;
-        this.imageSrc = (OpenLayers.Util.getImageLocation(SACLAY_IMAGE_PATH + 'cloud-popup-saclay.png'));
-        OpenLayers.Popup.Framed.prototype.initialize.apply(this, arguments);
-        this.contentDiv.className = this.contentDisplayClass;
-    },
-
-    CLASS_NAME: "OpenLayers.Popup.SaclayCloud"
-});
-
diff --git a/static/saclay/js/SaclayPanZoom.js b/static/saclay/js/SaclayPanZoom.js
deleted file mode 100644
index 40bfc87..0000000
--- a/static/saclay/js/SaclayPanZoom.js
+++ /dev/null
@@ -1,374 +0,0 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control/PanZoom.js
- */
-
-/**
- * Class: OpenLayers.Control.PanZoomBar
- * The PanZoomBar is a visible control composed of a
- * <OpenLayers.Control.PanPanel> and a <OpenLayers.Control.ZoomBar>. 
- * By default it is displayed in the upper left corner of the map as 4
- * directional arrows above a vertical slider.
- *
- * Inherits from:
- *  - <OpenLayers.Control.PanZoom>
- */
-OpenLayers.Control.SaclayPanZoom = OpenLayers.Class(OpenLayers.Control.PanZoom, {
-
-    /** 
-     * APIProperty: zoomStopWidth
-     */
-    zoomStopWidth: 18,
-
-    /** 
-     * APIProperty: zoomStopHeight
-     */
-    zoomStopHeight: 7,
-
-    /** 
-     * Property: slider
-     */
-    slider: null,
-
-    /** 
-     * Property: sliderEvents
-     * {<OpenLayers.Events>}
-     */
-    sliderEvents: null,
-
-    /** 
-     * Property: zoombarDiv
-     * {DOMElement}
-     */
-    zoombarDiv: null,
-
-    /** 
-     * APIProperty: zoomWorldIcon
-     * {Boolean}
-     */
-    zoomWorldIcon: false,
-
-    /**
-     * APIProperty: panIcons
-     * {Boolean} Set this property to false not to display the pan icons. If
-     * false the zoom world icon is placed under the zoom bar. Defaults to
-     * true.
-     */
-    panIcons: true,
-
-    /**
-     * APIProperty: forceFixedZoomLevel
-     * {Boolean} Force a fixed zoom level even though the map has 
-     *     fractionalZoom
-     */
-    forceFixedZoomLevel: false,
-
-    /**
-     * Property: mouseDragStart
-     * {<OpenLayers.Pixel>}
-     */
-    mouseDragStart: null,
-
-    /**
-     * Property: deltaY
-     * {Number} The cumulative vertical pixel offset during a zoom bar drag.
-     */
-    deltaY: null,
-
-    /**
-     * Property: zoomStart
-     * {<OpenLayers.Pixel>}
-     */
-    zoomStart: null,
-
-    /**
-     * Constructor: OpenLayers.Control.PanZoomBar
-     */ 
-    buttons: null,
-
-    /**
-     * Top position of the slider: change if the Y position of the slider have change
-     */
-    startTop: 75,
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-
-        this._removeZoomBar();
-
-        this.map.events.un({
-            "changebaselayer": this.redraw,
-            "updatesize": this.redraw,
-            scope: this
-        });
-
-        OpenLayers.Control.PanZoom.prototype.destroy.apply(this, arguments);
-
-        delete this.mouseDragStart;
-        delete this.zoomStart;
-    },
-    
-    /**
-     * Method: setMap
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Control.PanZoom.prototype.setMap.apply(this, arguments);
-        this.map.events.on({
-            "changebaselayer": this.redraw,
-            "updatesize": this.redraw,
-            scope: this
-        });
-    },
-
-    /** 
-     * Method: redraw
-     * clear the div and start over.
-     */
-    redraw: function() {
-        if (this.div !== null) {
-            this.removeButtons();
-            this._removeZoomBar();
-        }  
-        this.draw();
-    },
-    
-    /**
-    * Method: draw 
-    *
-    * Parameters:
-    * px - {<OpenLayers.Pixel>} 
-    */
-    draw: function(px) {
-        // initialize our internal div
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        px = this.position.clone();
-
-        console.log('plouf 1');
-        // place the controls
-        this.buttons = [];
-        var ids = ['panup', 'panleft', 'panright', 'pandown', 'zoomout', 'zoomin'];
-
-        for (var i = 0; i < ids.length; i++) {
-            var b = document.createElement('div');
-            b.id = ids[i];
-            b.action = ids[i];
-            b.className = 'button olButton';
-            this.div.appendChild(b);
-            this.buttons.push(b);
-        }
-
-        this._addZoomBar();
-        console.log('plouf '+this.div.id);
-        return this.div;
-    },
-
-    /** 
-    * Method: _addZoomBar
-    * 
-    * Parameters:
-    * centered - {<OpenLayers.Pixel>} where zoombar drawing is to start.
-    */
-    _addZoomBar:function() {
-        var id = this.id + "_" + this.map.id;
-        var zoomsToEnd = this.map.getNumZoomLevels() - 1 - this.map.getZoom();
-        var slider = document.createElement('div');
-        slider.id = 'slider';
-        slider.className = 'button';
-        slider.style.cursor = 'move';
-        this.slider = slider;
-        
-        this.sliderEvents = new OpenLayers.Events(this, slider, null, true,
-            { includeXY: true });
-        this.sliderEvents.on({
-            "touchstart": this.zoomBarDown,
-            "touchmove": this.zoomBarDrag,
-            "touchend": this.zoomBarUp,
-            "mousedown": this.zoomBarDown,
-            "mousemove": this.zoomBarDrag,
-            "mouseup": this.zoomBarUp
-        });
-        
-        var height = this.zoomStopHeight * (this.map.getNumZoomLevels());
-        // this is the background image
-        var div = document.createElement('div');
-        div.className = 'button';
-        div.id = 'zoombar';
-        this.zoombarDiv = div;
-        
-        this.div.appendChild(div);
-        this.div.appendChild(slider);
-
-        this.map.events.register("zoomend", this, this.moveZoomBar);
-    },
-    
-    /**
-     * Method: _removeZoomBar
-     */
-    _removeZoomBar: function() {
-        this.sliderEvents.un({
-            "touchstart": this.zoomBarDown,
-            "touchmove": this.zoomBarDrag,
-            "touchend": this.zoomBarUp,
-            "mousedown": this.zoomBarDown,
-            "mousemove": this.zoomBarDrag,
-            "mouseup": this.zoomBarUp
-        });
-        this.sliderEvents.destroy();
-        
-        this.div.removeChild(this.zoombarDiv);
-        this.zoombarDiv = null;
-        this.div.removeChild(this.slider);
-        this.slider = null;
-        
-        this.map.events.unregister("zoomend", this, this.moveZoomBar);
-    },
-    
-    /**
-     * Method: onButtonClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    onButtonClick: function(evt) {
-        console.log('onButtonClick');
-        OpenLayers.Control.PanZoom.prototype.onButtonClick.apply(this, arguments);
-        if (evt.buttonElement === this.zoombarDiv) {
-            var levels = evt.buttonXY.y / this.zoomStopHeight;
-            if (this.forceFixedZoomLevel || !this.map.fractionalZoom) {
-                levels = Math.floor(levels);
-            }    
-            var zoom = (this.map.getNumZoomLevels() - 1) - levels; 
-            zoom = Math.min(Math.max(zoom, 0), this.map.getNumZoomLevels() - 1);
-            this.map.zoomTo(zoom);
-        }
-    },
-    
-    /**
-     * Method: passEventToSlider
-     * This function is used to pass events that happen on the div, or the map,
-     * through to the slider, which then does its moving thing.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    passEventToSlider:function(evt) {
-        console.log('passEventToSlider');
-        this.sliderEvents.handleBrowserEvent(evt);
-    },
-    
-    /*
-     * Method: zoomBarDown
-     * event listener for clicks on the slider
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    zoomBarDown:function(evt) {
-        console.log('zoomBarDown');
-        if (!OpenLayers.Event.isLeftClick(evt) && !OpenLayers.Event.isSingleTouch(evt)) {
-            return;
-        }
-        this.map.events.on({
-            "touchmove": this.passEventToSlider,
-            "mousemove": this.passEventToSlider,
-            "mouseup": this.passEventToSlider,
-            scope: this
-        });
-        this.mouseDragStart = evt.xy.clone();
-        this.zoomStart = evt.xy.clone();
-        this.div.style.cursor = "move";
-        // reset the div offsets just in case the div moved
-        this.zoombarDiv.offsets = null; 
-        OpenLayers.Event.stop(evt);
-    },
-    
-    /*
-     * Method: zoomBarDrag
-     * This is what happens when a click has occurred, and the client is
-     * dragging.  Here we must ensure that the slider doesn't go beyond the
-     * bottom/top of the zoombar div, as well as moving the slider to its new
-     * visual location
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    zoomBarDrag: function(evt) {
-        console.log('zoomBarDrag');
-        if (this.mouseDragStart !== null) {
-            var deltaY = this.mouseDragStart.y - evt.xy.y;
-            var offsets = OpenLayers.Util.pagePosition(this.zoombarDiv);
-            if ((evt.clientY - offsets[1]) > 0 && 
-                (evt.clientY - offsets[1]) < 55) {
-                var newTop = parseInt(this.slider.style.top, 10) - deltaY;
-                this.slider.style.top = newTop + "px";
-                this.mouseDragStart = evt.xy.clone();
-            }
-            // set cumulative displacement
-            this.deltaY = this.zoomStart.y - evt.xy.y;
-            OpenLayers.Event.stop(evt);
-        }
-    },
-    
-    /*
-     * Method: zoomBarUp
-     * Perform cleanup when a mouseup event is received -- discover new zoom
-     * level and switch to it.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    zoomBarUp: function(evt) {
-        console.log('zoomBarUp');
-        if (!OpenLayers.Event.isLeftClick(evt) && evt.type !== "touchend") {
-            return;
-        }
-        if (this.mouseDragStart) {
-            this.div.style.cursor="";
-            this.map.events.un({
-                "touchmove": this.passEventToSlider,
-                "mouseup": this.passEventToSlider,
-                "mousemove": this.passEventToSlider,
-                scope: this
-            });
-            var zoomLevel = this.map.zoom;
-            if (!this.forceFixedZoomLevel && this.map.fractionalZoom) {
-                zoomLevel += this.deltaY/this.zoomStopHeight;
-                zoomLevel = Math.min(Math.max(zoomLevel, 0), 
-                                     this.map.getNumZoomLevels() - 1);
-            } else {
-                zoomLevel += this.deltaY/this.zoomStopHeight;
-                zoomLevel = Math.max(Math.round(zoomLevel), 0);      
-            }
-            this.map.zoomTo(zoomLevel);
-            this.mouseDragStart = null;
-            this.zoomStart = null;
-            this.deltaY = 0;
-            OpenLayers.Event.stop(evt);
-        }
-    },
-    
-    /*
-    * Method: moveZoomBar
-    * Change the location of the slider to match the current zoom level.
-    */
-    moveZoomBar:function() {
-        console.log('moveZoomBar');
-        console.log(this.map.getNumZoomLevels());
-        var newTop = 
-            ((this.map.getNumZoomLevels()-1) - this.map.getZoom()) * 
-            this.zoomStopHeight + this.startTop;
-        this.slider.style.top = newTop + "px";
-    },    
-    
-    CLASS_NAME: "OpenLayers.Control.SimplePanZoom"
-});
diff --git a/static/static_files_collected_here b/static/static_files_collected_here
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/static/static_files_collected_here
diff --git a/templates/chimere/base.html b/templates/chimere/base.html
index 5f88092..9728a20 100644
--- a/templates/chimere/base.html
+++ b/templates/chimere/base.html
@@ -2,12 +2,15 @@
 {% load chimere_tags i18n %}
 {% block extra_head %}
 <link href='https://fonts.googleapis.com/css?family=Numans' rel='stylesheet' type='text/css'/>
+<link rel="stylesheet" href="{{ STATIC_URL }}font-awesome/css/font-awesome.min.css" />
+<link rel="stylesheet" href="{{ STATIC_URL }}bootstrap/bootstrap.min.css" />
 <link rel="shortcut icon" href="{{ STATIC_URL }}saclay/images/favicon.png"/>
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/styles.css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/print.css" media='print'/>
 <link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/styles.css" />
 {% for css in EXTRA_CSS %}<link rel="stylesheet" href="{{ css }}" />{% endfor %}
 <link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/print.css" media='print'/>
+<script src="{{ STATIC_URL }}bootstrap/bootstrap.min.js" type="text/javascript"></script>
 {% if MOBILE %}
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/mobile.css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/mobile.css" />
diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html
index dca7fc7..b98ba89 100644
--- a/templates/chimere/blocks/actions.html
+++ b/templates/chimere/blocks/actions.html
@@ -13,7 +13,7 @@
                 {% trans "News" %}
             </li>
             <li id='action-project' class='dyn-page'>
-                <a href='{% url chimere:extra_page "" "project"%}'>{% trans "The project" %}</a>
+                <a href='{% url 'chimere:extra_page' "" "project"%}'>{% trans "The project" %}</a>
             </li>
         </ul>
         <ul id='action-3' class='action'>
diff --git a/templates/chimere/blocks/categories.html b/templates/chimere/blocks/categories.html
index d5242e0..05115ef 100644
--- a/templates/chimere/blocks/categories.html
+++ b/templates/chimere/blocks/categories.html
@@ -22,11 +22,6 @@
 <script type='text/javascript'>
 <!--
 $(function() {
-    $('label').click(function() {
-        if ($.browser.msie && $.browser.version.substr(0,1)<9) {
-          $('#' + $(this).attr('for')).click();
-        }
-    });
     if(chimere_init_options && chimere_init_options['checked_categories']){
         for (k=0;k<chimere_init_options['checked_categories'].length;k++){
             $('#li_sub_'+chimere_init_options['checked_categories'][k]+' span'
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index 037d5a8..20c5d4b 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -1,15 +1,9 @@
 {% load i18n %}
 <div id='{{map_id}}'></div>
+<div id='popup'></div>
+<div id='layerSwitcher'></div>
 <script type="text/javascript">
-   <!--
 $("#{{map_id}}").show();
-$(function(){
-   $('#cluster_list').dialog({'autoOpen':false,
-                              'resizable':false,
-                              'width':340,
-                              'dialogClass':'no-titlebar-small'});
-});
-   // -->
 </script>
 <div id="waiting">
     <div id="waiting-content">
@@ -17,14 +11,16 @@ $(function(){
         <p>{% trans "Loading of the map in progress" %}</p>
     </div>
 </div>
+
 <div id="layer_selection">
   <h4>{% trans "Display options" %}</h4>
   <ul id='layer_list'>
     <li class='head layer_map_type'>{% trans "Map type"%}</li>
   </ul>
 </div>
+
+
 <script type="text/javascript">
-    <!--
     //LIB iOS
     var connectWebViewJavascriptBridge = function(callback) {
         if (window.WebViewJavascriptBridge) {
@@ -49,7 +45,7 @@ $(function(){
                            });
                     }
                 bridge.send('sidebarHide');
-        }); 
+        });
     });
     $('#sidebar-handler-show').click(function(){
         $('#sidebar').show();
@@ -65,8 +61,7 @@ $(function(){
                            });
                     }
                 bridge.send('sidebarShow');
-        }); 
-        
+        });
     });
     //fin  lib ios
     var routing_panel_open = function(){
@@ -104,24 +99,44 @@ $(function(){
 
     {% if single_category %}
     $(function() {$('#panel').hide()});{% endif %}
-    var chimere_init_options = {};
-    {% if MOBILE %}chimere_init_options["mobile"] = true;{% endif %}
-    {% if enable_clustering %}chimere_init_options["enable_clustering"] = true;{% endif %}
-    chimere_init_options["routing_panel_open"] = routing_panel_open;
-    chimere_init_options["category_accordion"] = false;
-    chimere_init_options["cluster_icon"] = new OpenLayers.Icon(
-                    STATIC_URL + "saclay/images/cluster_icon.png",
-                    new OpenLayers.Size(39, 46),
-                    new OpenLayers.Pixel(-(39/2), -(46/2)));
-    chimere_init_options["category_plus"] = STATIC_URL + "saclay/images/plus.png";
-    chimere_init_options["category_minus"] = STATIC_URL + "saclay/images/minus.png";
-    chimere_init_options["popupClass"] = OpenLayers.Popup.SaclayCloud;
-    chimere_init_options["popupClass"].imageSrc = "{{STATIC_URL}}/saclay/js/cloud-popup-saclay.png";
-    chimere_init_options["popupContentFull"] = true;
-    chimere_init_options["explicit_popup_hide"] = true;
-    chimere_init_options["edition_type_is_route"] = true;
-    chimere_init_options["display_feature_detail_fx"] = display_feature_detail;
-
+    var chimere_init_options = {
+        {% if MOBILE %}"mobile": true,{% endif %}
+        {% if enable_clustering %}"enable_clustering": true,{% endif %}
+        "routing_panel_open": routing_panel_open,
+        "category_accordion": false,
+        "category_plus": STATIC_URL + "saclay/images/plus.png",
+        "category_minus": STATIC_URL + "saclay/images/minus.png",
+        "popupContentFull": true,
+        "explicit_popup_hide": true,
+        "map_layers": [{{js_map_layers|safe|escape}}],
+        'permalink_label': '{%trans "Permalink"%}',
+        'permalink_element': document.getElementById('permalink'),
+        'routing': {{routing}},
+        {% if dynamic_categories %}'dynamic_categories': true,{% endif %}
+        {% if default_area %}"default_area": new Array({{default_area.upper_left_corner.x}}, {{default_area.upper_left_corner.y}}, {{default_area.lower_right_corner.x}}, {{default_area.lower_right_corner.y}}),{% endif %}
+        {% if p_zoom %}"zoom": {{ p_zoom }},{% endif %}
+        {% if p_lat %}"lat": {{ p_lat }},{% endif %}
+        {% if p_lon %}"lon": {{ p_lon }},{% endif %}
+        {% if p_routing_start_lon %}"routing_start_lon": {{ p_routing_start_lon }},{% endif %}
+        {% if p_routing_start_lat %}"routing_start_lat": {{ p_routing_start_lat }},{% endif %}
+        {% if p_routing_end_lon %}"routing_end_lon": {{ p_routing_end_lon }},{% endif %}
+        {% if p_routing_end_lat %}"routing_end_lat": {{ p_routing_end_lat }},{% endif %}
+        {% if p_routing_steps %}"routing_steps_lonlat": [{{ p_routing_steps }}],{% endif %}
+        {% if p_routing_transport %}"routing_transport": "{{ p_routing_transport }}",{% endif %}
+        {% if p_routing_speed %}"routing_speed": "{{ p_routing_speed }}",{% endif %}
+        "dynamic_categories": {{ dynamic_categories }},
+        {% if p_display_submited %}"display_submited": {{ p_display_submited }},{% endif %}
+        "checked_categories": [{% for cc in checked_categories %}{% if forloop.counter0 > 0 %}, {% endif %}{{cc}}{% endfor %}],
+        {% if area_id %}'area_id': "{{area_id}}",{% endif %}
+        {% if p_current_feature %}"display_feature": {{ p_current_feature }},{% endif %}
+        {% if selected_map_layer %}"selected_map_layer": {{selected_map_layer}},{% endif %}
+        "display_feature_detail_callback": display_feature_detail_callback,
+        "edition_type_is_route": true
+    }
+    {% if restricted_extent %}{{ restricted_extent }}
+    chimere_init_options["restricted_extent"] = bounds;
+    {% endif %}
+    {% comment %}
     chimere_init_options["default_icon"] = new OpenLayers.Icon(
                     '{{STATIC_URL}}saclay/images/default_icon.png',
                     new OpenLayers.Size(37, 42),
@@ -138,6 +153,7 @@ $(function(){
                     '{{STATIC_URL}}saclay/images/routing_step.png',
                     new OpenLayers.Size(37, 42),
                     new OpenLayers.Pixel(-(37/2), -42));
+    };
     var numZoomLevels = 7;
     var maxZoomLevel = 19;
     var resolutions;
@@ -152,40 +168,17 @@ $(function(){
         zoomOffset = minZoomLevel;
     }
 
-    chimere_init_options["map_layers"] = [{{js_map_layers|safe|escape}}];
-    chimere_init_options['permalink_label'] = '{%trans "Permalink"%}';
-    chimere_init_options['permalink_element'] = document.getElementById('permalink');
-    chimere_init_options['routing'] = {{routing}};
-    {% if dynamic_categories %}chimere_init_options['dynamic_categories'] = true;{% endif %}
-    {% if default_area %}
-    chimere_init_options["default_area"] = new Array({{default_area.upper_left_corner.x}}, {{default_area.upper_left_corner.y}}, {{default_area.lower_right_corner.x}}, {{default_area.lower_right_corner.y}});
-    {% endif %}
-    {% if p_zoom %}chimere_init_options["zoom"] = {{ p_zoom }};{% endif %}
-    {% if p_lat %}chimere_init_options["lat"] = {{ p_lat }};{% endif %}
-    {% if p_lon %}chimere_init_options["lon"] = {{ p_lon }};{% endif %}
-    {% if p_routing_start_lon %}chimere_init_options["routing_start_lon"] = {{ p_routing_start_lon }};{% endif %}
-    {% if p_routing_start_lat %}chimere_init_options["routing_start_lat"] = {{ p_routing_start_lat }};{% endif %}
-    {% if p_routing_end_lon %}chimere_init_options["routing_end_lon"] = {{ p_routing_end_lon }};{% endif %}
-    {% if p_routing_end_lat %}chimere_init_options["routing_end_lat"] = {{ p_routing_end_lat }};{% endif %}
-    {% if p_routing_steps %}chimere_init_options["routing_steps_lonlat"] = [{{ p_routing_steps }}];{% endif %}
-    {% if p_routing_transport %}chimere_init_options["routing_transport"] = "{{ p_routing_transport }}";{% endif %}
-    {% if p_routing_speed %}chimere_init_options["routing_speed"] = "{{ p_routing_speed }}";{% endif %}
-    chimere_init_options["icon_offset"] = new OpenLayers.Pixel({{icon_offset_x}},
-                                                               {{icon_offset_y}});
-    chimere_init_options['marker_hover_offset'] = new OpenLayers.Pixel(7, 20);
-    chimere_init_options["dynamic_categories"] = {{ dynamic_categories }};
-    {% if p_display_submited %}chimere_init_options["display_submited"] = {{ p_display_submited }};{% endif %}
-    chimere_init_options["checked_categories"] = [{% for cc in checked_categories %}{% if forloop.counter0 > 0 %}, {% endif %}{{cc}}{% endfor %}];
-    {% if area_id %}chimere_init_options['area_id'] = "{{area_id}}";{% endif %}
-    {% if p_current_feature %}
-    chimere_init_options["display_feature"] = {{ p_current_feature }};
-    {% endif %}
-    {% if restricted_extent %}{{ restricted_extent }}
-    chimere_init_options["restricted_extent"] = bounds;
-    {% endif %}
-    {% if selected_map_layer %}
-    chimere_init_options["selected_map_layer"] = {{selected_map_layer}};
-    {% endif %}
+        "icon_offset": new OpenLayers.Pixel({{icon_offset_x}},
+                                                                   {{icon_offset_y}}),
+        'marker_hover_offset': new OpenLayers.Pixel(7, 20),
+        "popupClass"].imageSrc = "{{STATIC_URL}}/saclay/js/cloud-popup-saclay.png",
+        "cluster_icon": new OpenLayers.Icon(
+                        STATIC_URL + "saclay/images/cluster_icon.png",
+                        new OpenLayers.Size(39, 46),
+                        new OpenLayers.Pixel(-(39/2), -(46/2))),
+        //"display_feature_detail_fx": display_feature_detail,
+    {% endcomment %}
+
     $("#{{map_id}}").chimere(chimere_init_options);
     {% if zoom %}
     $('#maps').chimere('zoom', {'area':{{zoom}} });
@@ -227,7 +220,17 @@ $(function(){
             }
         });
     });
-    // -->
 </script>
 <div id='marker_hover'><div id='marker_hover_content'></div></div>
-<div id='cluster_list'></div>
+<div class="modal fade" id="cluster_list" tabindex="-1" role="dialog" aria-labelledby="cluster-label" aria-hidden="true">
+  <div class="modal-dialog modal-sm">
+    <div class="modal-content">
+      <div class="modal-header modal-header-success">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="cluster-label">&nbsp;</h4>
+      </div>
+      <div class="modal-body">
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/templates/chimere/blocks/news.html b/templates/chimere/blocks/news.html
index 3788b64..0bc04a1 100644
--- a/templates/chimere/blocks/news.html
+++ b/templates/chimere/blocks/news.html
@@ -2,9 +2,9 @@
 <script type='text/javascript'>
 <!--
 $(function(){
-    $('#news div.media-player').jmeEmbedControls();
+    /*$('#news div.media-player').jmeEmbedControls();
     $('#news video').each(function(index){$(this).pause()});
-    $('#news audio').each(function(index){$(this).pause()});
+    $('#news audio').each(function(index){$(this).pause()});*/
     $("#news").dialog({width:630, dialogClass:'no-titlebar',
                        autoOpen:false});
 });
diff --git a/templates/chimere/blocks/share_bar.html b/templates/chimere/blocks/share_bar.html
index b23c9e2..e8f3474 100644
--- a/templates/chimere/blocks/share_bar.html
+++ b/templates/chimere/blocks/share_bar.html
@@ -8,7 +8,7 @@
         {% if not email_only %}<li class='share-icon'><a href="#">{% trans "Share" %}</a></li>{% for share_network in share_networks %}
         <li class='shared'><a class='share_link share_id_{{share_network.0}}' href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li>
     {% endfor %}
-        {% if rss %}<li class='shared'><a href='{% url chimere:feeds-global %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{% endif %}{%endif%}
+        {% if rss %}<li class='shared'><a href='{% url "chimere:feeds-global" %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{% endif %}{%endif%}
     </ul>{% endif %}
     <script type='text/javascript'>
         <!--
diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html
index 0e7d4bf..6e7aab0 100644
--- a/templates/chimere/blocks/welcome.html
+++ b/templates/chimere/blocks/welcome.html
@@ -3,9 +3,10 @@
 <script type='text/javascript'>
 <!--
 $(function(){
+    /*
     $('#welcome div.media-player').jmeEmbedControls();
     $('#welcome video').each(function(index){$(this).pause()});
-    $('#welcome audio').each(function(index){$(this).pause()});
+    $('#welcome audio').each(function(index){$(this).pause()});*/
     $("#welcome").dialog({width:550, height:350, dialogClass:'welcome-dialog'
                           {% if not display %}, autoOpen:false{% endif %},
                       open: function () { $("#welcome_content").scrollTop(0); }
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index 5f576d7..c65a93d 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -44,7 +44,7 @@
     </ul>
     {% share_bar marker.name '' '' %}
     {% comment %}
-    <a href='{% if marker.route %}{% url chimere:editroute-item area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url chimere:edit-item area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'>
+    <a href='{% if marker.route %}{% url 'chimere:editroute-item' area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url 'chimere:edit-item' area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'>
         {% trans "Submit a modification" %}
     </a>
     {% endcomment %}
@@ -55,7 +55,7 @@ $('html').addClass('js-on');
 $(function(){
     $("#gallery-{{marker.pk}}").dialog({title:"{{marker.name}}", autoOpen: false,
                            height: "auto", width: "auto", dialogClass:'no-titlebar'});
-    $('div.media-player').jmeEmbedControls();
+   /* $('div.media-player').jmeEmbedControls();
     $('.tabs').tabs({
         select: function(event, ui) {
             //pause all medias
@@ -79,6 +79,7 @@ $(function(){
     }).bind('userinactive', function(){
         $('div.media-controls', this).stop().animate({opacity: 0});
     });
+    */
 });
 $("#gallery-{{marker.pk}}").bind( "dialogopen", function(event, ui) {
     $("#gallery-{{marker.pk}}").dialog("option", "height", 'auto');
diff --git a/templates/chimere/edit.html b/templates/chimere/edit.html
index de60dc5..5c564c3 100644
--- a/templates/chimere/edit.html
+++ b/templates/chimere/edit.html
@@ -18,7 +18,7 @@ Les évènements à caractère politique, confessionnel ainsi que ceux relevant
     {% endif%}{% endif%}
     </div>
     <p class='notice'>* {% trans "indicates a mandatory field" %}</p>
-    <form enctype="multipart/form-data" method='post' action='{% if route%}{% url edit-route%}{%else%}{% url edit %}{% endif %}' id='proposition_form'>
+    <form enctype="multipart/form-data" method='post' action='{% if route%}{% url 'edit-route' %}{%else%}{% url 'edit' %}{% endif %}' id='proposition_form'>
     {% csrf_token %}
     {% if not route %}
     <div class="fieldWrapper point_label">
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 28beea9..9194e54 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -5,8 +5,6 @@
 {% head_chimere %}
 {% head_jme %}
 {% head_form %}
-<script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}saclay/js/SaclayCloud.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}saclay/js/jquery.form.js" type="text/javascript"></script>
 {% if has_search %}
 <script src="{{ STATIC_URL }}saclay/js/search.js" type="text/javascript"></script>
@@ -15,9 +13,9 @@
 <script type='text/javascript' language='javascript'>
     <!--
     var default_error_message = "{% trans "Error while loading the page... Refresh the page. If the problem persist contact the webmaster." %}";
-    var edit_url = "{% url edit %}";
-    var edit_event_url = "{% url edit-event %}";
-    var edit_route_url = "{% url edit-route %}";
+    var edit_url = "{% url 'edit' %}";
+    var edit_event_url = "{% url 'edit-event' %}";
+    var edit_route_url = "{% url 'edit-route' %}";
     // -->
 </script>
 <script src="{{ STATIC_URL }}saclay/js/interface.js" type="text/javascript"></script>
@@ -70,7 +68,7 @@
     </div>
     <div class='footer' id='footer-panel'>
         {% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact us" %}</a> | {% endif %}
-        <a href='{% url chimere:extra_page '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service, credits" %}</a>
+        <a href='{% url 'chimere:extra_page' '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service, credits" %}</a>
     </div>
 {% endblock %}
 {% block content %}
diff --git a/urls.py b/urls.py
index 739c2f0..fe91a99 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2012-2016 Etienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as
@@ -18,37 +18,47 @@
 # See the file COPYING for details.
 
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
+from django.conf.urls.static import static
 
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 admin.autodiscover()
-urlpatterns = patterns('django.views.static',
+urlpatterns = patterns(
+    'django.views.static',
     (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve',
      {'document_root': settings.MEDIA_ROOT}),
 )
+
+if "tinymce" in settings.INSTALLED_APPS:
+    urlpatterns += patterns(
+        'django.views.static',
+        (r'^tinymce/', include('tinymce.urls')),)
+
 urlpatterns += staticfiles_urlpatterns()
 
-urlpatterns += patterns('',
+urlpatterns += patterns(
+    '',
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
     url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', 'chimere_saclay.views.edit',
         name="edit"),
-    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/(?P<item_id>\w+)/(?P<submited>\w+)?$',
-            'chimere_saclay.views.edit', name="edit-item"),
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/(?P<item_id>\w+)/'
+        r'(?P<submited>\w+)?$',
+        'chimere_saclay.views.edit', name="edit-item"),
     url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-event/$',
-        'chimere_saclay.views.edit', name="edit-event", kwargs={'event':True}),
-    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-event/(?P<item_id>\w+)/(?P<submited>\w+)?$',
-        'chimere_saclay.views.edit', kwargs={'event':True},
-        name="edit-event-item"),
+        'chimere_saclay.views.edit', name="edit-event",
+        kwargs={'event': True}),
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-event/(?P<item_id>\w+)/'
+        r'(?P<submited>\w+)?$', 'chimere_saclay.views.edit',
+        kwargs={'event': True}, name="edit-event-item"),
     url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/$',
         'chimere_saclay.views.edit_route', name="edit-route"),
-    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/(?P<submited>\w+)?$',
-        'chimere_saclay.views.edit_route', name="edit-route-item"),
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/'
+        r'(?P<submited>\w+)?$', 'chimere_saclay.views.edit_route',
+        name="edit-route-item"),
     url(r'^(saclay/)?$', 'chimere_saclay.views.index_saclay',
         name="index-saclay"),
     url(r'^', include('chimere.urls', namespace="chimere")),
-)
-
-
+) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/views.py b/views.py
index 86729bb..8e2c6a4 100644
--- a/views.py
+++ b/views.py
@@ -27,6 +27,7 @@ from chimere.actions import actions
 from chimere.models import Marker, Route, PropertyModel
 from chimere.views import get_edit_page, index
 
+
 def index_saclay(request, area_name=None, default_area=None, simple=False):
     tpl, response_dct = index(request, area_name, default_area, simple,
                               get_response=True)
@@ -37,6 +38,7 @@ def index_saclay(request, area_name=None, default_area=None, simple=False):
 
 get_edit_marker = get_edit_page('edit', Marker, MarkerForm)
 
+
 def edit(request, area_name="", item_id=None, submited=False, event=False):
     """
     Edition page
@@ -46,28 +48,28 @@ def edit(request, area_name="", item_id=None, submited=False, event=False):
     if response:
         return response
     item_id, init_item, response_dct, form, formset_multi, formset_picture = \
-                                                                        values
+        values
     # get the "manualy" declared_fields. Ie: properties
     declared_fields = form.declared_fields.keys()
     declared_fields = PropertyModel.objects.filter(available=True).all()
-    filtered_properties = PropertyModel.objects.filter(available=True,
-                                subcategories__id__isnull=False).all()
+    filtered_properties = PropertyModel.objects.filter(
+        available=True, subcategories__id__isnull=False).all()
     response_dct.update({
-        'actions':actions,
-        'action_selected':('contribute', 'edit'),
-        'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER,
-        'form':form,
-        'formset_multi':formset_multi,
-        'formset_picture':formset_picture,
-        'dated':settings.CHIMERE_DAYS_BEFORE_EVENT,
-        'extra_head':form.media,
-        'marker_id':item_id,
-        'sub_categories':sub_categories,
-        'point_widget':'',
-        'properties':declared_fields,
-        'filtered_properties':filtered_properties,
-        'submited':submited,
-        'event':event,
+        'actions': actions,
+        'action_selected': ('contribute', 'edit'),
+        'map_layer': settings.CHIMERE_DEFAULT_MAP_LAYER,
+        'form': form,
+        'formset_multi': formset_multi,
+        'formset_picture': formset_picture,
+        'dated': settings.CHIMERE_DAYS_BEFORE_EVENT,
+        'extra_head': form.media,
+        'marker_id': item_id,
+        'sub_categories': sub_categories,
+        'point_widget': '',
+        'properties': declared_fields,
+        'filtered_properties': filtered_properties,
+        'submited': submited,
+        'event': event,
     })
     # manualy populate the custom widget
     if 'subcategory' in form.data and form.data['subcategory']:
@@ -77,37 +79,38 @@ def edit(request, area_name="", item_id=None, submited=False, event=False):
 
 get_edit_route = get_edit_page('edit-route', Route, RouteForm)
 
+
 def edit_route(request, area_name="", item_id=None, submited=False):
     """
     Edition page
     """
     response, values, sub_categories = get_edit_route(request, area_name,
-                                                       item_id, ['R', 'B'])
+                                                      item_id, ['R', 'B'])
     if response:
         return response
     item_id, init_item, response_dct, form, formset_multi, formset_picture = \
-                                                                        values
+        values
     # get the "manualy" declared_fields. Ie: properties
     declared_fields = form.declared_fields.keys()
     declared_fields = PropertyModel.objects.filter(available=True).all()
-    filtered_properties = PropertyModel.objects.filter(available=True,
-                                subcategories__id__isnull=False).all()
+    filtered_properties = PropertyModel.objects.filter(
+        available=True, subcategories__id__isnull=False).all()
     response_dct.update({
-        'actions':actions,
-        'action_selected':('contribute', 'edit'),
-        'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER,
-        'form':form,
-        'formset_multi':formset_multi,
-        'formset_picture':formset_picture,
-        'dated':settings.CHIMERE_DAYS_BEFORE_EVENT,
-        'extra_head':form.media,
-        'marker_id':item_id,
-        'sub_categories':sub_categories,
-        'point_widget':'',
-        'properties':declared_fields,
-        'filtered_properties':filtered_properties,
-        'submited':submited,
-        'route':True
+        'actions': actions,
+        'action_selected': ('contribute', 'edit'),
+        'map_layer': settings.CHIMERE_DEFAULT_MAP_LAYER,
+        'form': form,
+        'formset_multi': formset_multi,
+        'formset_picture': formset_picture,
+        'dated': settings.CHIMERE_DAYS_BEFORE_EVENT,
+        'extra_head': form.media,
+        'marker_id': item_id,
+        'sub_categories': sub_categories,
+        'point_widget': '',
+        'properties': declared_fields,
+        'filtered_properties': filtered_properties,
+        'submited': submited,
+        'route': True
     })
     # manualy populate the custom widget
     if 'subcategory' in form.data and form.data['subcategory']: